breeze-client 2.1.6-mjs → 2.1.7

package/{fesm2022/breeze-client.mjs → fesm2015/breeze-client.js}

@@ -47,8 +47,6 @@ Note that we have Error['x'] = ... in some places in the code to prevent Terser
 @dynamic
 */
 class BreezeEnum {
-    /** @hidden @internal */
-    static _resolvedNamesAndSymbols;
     /**  */
     constructor(propertiesObj) {
         if (propertiesObj) {
@@ -144,14 +142,15 @@ class BreezeEnum {
 /** See if this comment will make it into .d.ts */
 let hasOwnProperty = uncurry(Object.prototype.hasOwnProperty);
 let arraySlice = uncurry(Array.prototype.slice);
-let isES5Supported = function () {
+const ɵ0 = function () {
     try {
         return !!(Object.getPrototypeOf && Object.defineProperty({}, 'x', {}));
     }
     catch (e) {
         return false;
     }
-}();
+};
+let isES5Supported = ɵ0();
 // iterate over object
 function objectForEach(obj, kvFn) {
     for (let key in obj) {
@@ -732,7 +731,7 @@ function isNumeric(n) {
 }
 // end of is Functions
 // string functions
-function stringStartsWith$1(str, prefix) {
+function stringStartsWith(str, prefix) {
     // returns true for empty string or null prefix
     if ((!str))
         return false;
@@ -740,7 +739,7 @@ function stringStartsWith$1(str, prefix) {
         return true;
     return str.indexOf(prefix, 0) === 0;
 }
-function stringEndsWith$1(str, suffix) {
+function stringEndsWith(str, suffix) {
     // returns true for empty string or null suffix
     if ((!str))
         return false;
@@ -830,8 +829,8 @@ const core = {
     isNumeric: isNumeric,
     identity: identity,
     noop: noop,
-    stringStartsWith: stringStartsWith$1,
-    stringEndsWith: stringEndsWith$1,
+    stringStartsWith: stringStartsWith,
+    stringEndsWith: stringEndsWith,
     formatString: formatString,
     titleCase: titleCaseSpace,
     toJson: toJson,
@@ -854,23 +853,19 @@ function isPrimitive(obj: any) {
 
 /** @hidden @internal */
 class Param {
-    // The %1 parameter
-    // is required
-    // must be a %2
-    // must be an instance of %2
-    // must be an instance of the %2 enumeration
-    // must have a %2 property
-    // must be an array where each element
-    // is optional or
-    v;
-    name;
-    defaultValue;
-    parent;
-    /** @hidden @internal */
-    _context;
-    /** @hidden @internal */
-    _contexts;
     constructor(v, name) {
+        /** @hidden @internal */
+        this._applyOne = function (instance) {
+            if (this.v !== undefined) {
+                instance[this.name] = this.v;
+            }
+            else {
+                if (this.defaultValue !== undefined) {
+                    instance[this.name] = this.defaultValue;
+                }
+            }
+        };
+        this.MESSAGE_PREFIX = "The '%1' parameter ";
         this.v = v;
         this.name = name;
         this._contexts = [null];
@@ -1016,18 +1011,6 @@ class Param {
             }
         }
     }
-    /** @hidden @internal */
-    _applyOne = function (instance) {
-        if (this.v !== undefined) {
-            instance[this.name] = this.v;
-        }
-        else {
-            if (this.defaultValue !== undefined) {
-                instance[this.name] = this.defaultValue;
-            }
-        }
-    };
-    MESSAGE_PREFIX = "The '%1' parameter ";
 }
 /** @hidden @internal */
 let assertParam = function (v, name) {
@@ -1156,8 +1139,6 @@ function throwConfigError(instance, message) {
     throw new Error(core.formatString("Error configuring an instance of '%1'. %2", (instance && instance._$typeName) || "object", message));
 }
 class ConfigParam {
-    config;
-    params;
     constructor(config) {
         if (typeof (config) !== "object") {
             throw new Error("Configuration parameter should be an object, instead it is a: " + typeof (config));
@@ -1213,18 +1194,6 @@ Class to support basic event publication and subscription semantics.
 @dynamic
 **/
 class BreezeEvent {
-    /** @hidden @internal */
-    static __eventNameMap = {};
-    /** @hidden @internal */
-    static __nextUnsubKey = 1;
-    /** The name of this Event */
-    name;
-    /** The object doing the publication. i.e. the object to which this event is attached. */
-    publisher;
-    /** @hidden @internal */
-    _subscribers;
-    /** @hidden @internal */
-    _defaultErrorCallback;
     /**
     Constructor for an Event
     >     salaryEvent = new BreezeEvent("salaryEvent", person);
@@ -1234,6 +1203,36 @@ class BreezeEvent {
     If omitted then subscriber notification failures will be ignored.
     **/
     constructor(name, publisher, defaultErrorCallback) {
+        /**
+        Unsubscribe from this event.
+        >      // Assume order is a preexisting 'order' entity
+        >      let token = order.entityAspect.propertyChanged.subscribe(function (pcEvent) {
+        >              // do something
+        >      });
+        >      // sometime later
+        >      order.entityAspect.propertyChanged.unsubscribe(token);
+        @param unsubKey - The value returned from the 'subscribe' method may be used to unsubscribe here.
+        @return Whether unsubscription occured. This will return false if already unsubscribed or if the key simply
+        cannot be found.
+        **/
+        this.unsubscribe = function (unsubKey) {
+            if (!this._subscribers)
+                return false;
+            let subs = this._subscribers;
+            let ix = core.arrayIndexOf(subs, function (s) {
+                return s.unsubKey === unsubKey;
+            });
+            if (ix !== -1) {
+                subs.splice(ix, 1);
+                if (subs.length === 0) {
+                    this._subscribers = null;
+                }
+                return true;
+            }
+            else {
+                return false;
+            }
+        };
         assertParam(name, "eventName").isNonEmptyString().check();
         assertParam(publisher, "publisher").isObject().check();
         this.name = name;
@@ -1318,36 +1317,6 @@ class BreezeEvent {
         ++BreezeEvent.__nextUnsubKey;
         return unsubKey;
     }
-    /**
-    Unsubscribe from this event.
-    >      // Assume order is a preexisting 'order' entity
-    >      let token = order.entityAspect.propertyChanged.subscribe(function (pcEvent) {
-    >              // do something
-    >      });
-    >      // sometime later
-    >      order.entityAspect.propertyChanged.unsubscribe(token);
-    @param unsubKey - The value returned from the 'subscribe' method may be used to unsubscribe here.
-    @return Whether unsubscription occured. This will return false if already unsubscribed or if the key simply
-    cannot be found.
-    **/
-    unsubscribe = function (unsubKey) {
-        if (!this._subscribers)
-            return false;
-        let subs = this._subscribers;
-        let ix = core.arrayIndexOf(subs, function (s) {
-            return s.unsubKey === unsubKey;
-        });
-        if (ix !== -1) {
-            subs.splice(ix, 1);
-            if (subs.length === 0) {
-                this._subscribers = null;
-            }
-            return true;
-        }
-        else {
-            return false;
-        }
-    };
     /** remove all subscribers */
     clear() {
         this._subscribers = null;
@@ -1412,42 +1381,42 @@ class BreezeEvent {
         // return ctor._isEnabled(getFullEventName(eventName), obj);
         return BreezeEvent._isEnabled(eventName, 3);
     }
-    /** @hidden @internal */
-    static _isEnabled = function (eventName, obj) {
-        let isEnabled = null;
-        let ob = obj;
-        let eventMap = ob._$eventMap;
-        if (eventMap) {
-            isEnabled = eventMap[eventName];
+}
+/** @hidden @internal */
+BreezeEvent.__eventNameMap = {};
+/** @hidden @internal */
+BreezeEvent.__nextUnsubKey = 1;
+/** @hidden @internal */
+BreezeEvent._isEnabled = function (eventName, obj) {
+    let isEnabled = null;
+    let ob = obj;
+    let eventMap = ob._$eventMap;
+    if (eventMap) {
+        isEnabled = eventMap[eventName];
+    }
+    if (isEnabled != null) {
+        if (typeof isEnabled === 'function') {
+            return !!isEnabled(obj);
         }
-        if (isEnabled != null) {
-            if (typeof isEnabled === 'function') {
-                return !!isEnabled(obj);
-            }
-            else {
-                return !!isEnabled;
-            }
+        else {
+            return !!isEnabled;
+        }
+    }
+    else {
+        let parent = ob._getEventParent && ob._getEventParent();
+        if (parent) {
+            return !!this._isEnabled(eventName, parent);
         }
         else {
-            let parent = ob._getEventParent && ob._getEventParent();
-            if (parent) {
-                return !!this._isEnabled(eventName, parent);
-            }
-            else {
-                // default if not explicitly disabled.
-                return true;
-            }
+            // default if not explicitly disabled.
+            return true;
         }
-    };
-}
+    }
+};
 // legacy support - deliberately not typed
 core.Event = BreezeEvent;
 
 class InterfaceDef {
-    name;
-    defaultInstance;
-    /** @hidden @internal */
-    _implMap;
     constructor(name) {
         this.name = name;
         this.defaultInstance = undefined;
@@ -1473,23 +1442,18 @@ class InterfaceDef {
     }
 }
 class BreezeConfig {
-    functionRegistry = {};
-    typeRegistry = {};
-    objectRegistry = {};
-    interfaceInitialized;
-    stringifyPad = '';
-    /** whether to prohibit eval() and Function() in breeze code */
-    noEval;
-    /** @hidden @internal */
-    _interfaceRegistry; // will be set in adapter-interfaces. untyped here to avoid circularity issues.
     constructor() {
+        this.functionRegistry = {};
+        this.typeRegistry = {};
+        this.objectRegistry = {};
+        this.stringifyPad = '';
         this.interfaceInitialized = new BreezeEvent("interfaceInitialized", this);
         if (this.noEval === undefined) {
             try {
                 Error['x'] = Function('');
                 this.noEval = false; // eval succeeded
             }
-            catch {
+            catch (_a) {
                 this.noEval = true; // eval failed, probably due to CSP
             }
         }
@@ -1687,24 +1651,6 @@ anytime a MetadataStore.fetchMetadata call occurs with a new dataService ( or se
 
 **/
 class DataService {
-    /** @hidden @internal */
-    _$typeName; // actually put on prototype.
-    /** The serviceName for this DataService. __Read Only__ **/
-    serviceName;
-    /** The adapter name for the [[IDataServiceAdapter]] to be used with this service. __Read Only__  **/
-    adapterName;
-    /**  The [[IDataServiceAdapter]] implementation instance associated with this EntityManager. __Read Only__  **/
-    adapterInstance;
-    /** The adapter name for the [[IUriBuilderAdapter]] to be used with this service. __Read Only__  **/
-    uriBuilderName;
-    /**  The [[IUriBuilderAdapter]] implementation instance associated with this EntityManager. __Read Only__  **/
-    uriBuilder;
-    /** Whether the server can provide metadata for this service. __Read Only__   **/
-    hasServerMetadata;
-    /** The [[JsonResultsAdapter]] used to process the results of any query against this DataService. __Read Only__ **/
-    jsonResultsAdapter;
-    /** Whether to use JSONP when performing a 'GET' request against this service. __Read Only__  **/
-    useJsonp;
     /**   DataService constructor
     >     var dataService = new DataService({
     >         serviceName: altServiceName,
@@ -1722,7 +1668,7 @@ class DataService {
     @param config - A configuration object.
     **/
     constructor(config) {
-        updateWithConfig$1(this, config);
+        updateWithConfig(this, config);
     }
     /**
     Returns a copy of this DataService with the specified properties applied.
@@ -1732,7 +1678,7 @@ class DataService {
         if (!config)
             return this;
         let result = new DataService(this);
-        return updateWithConfig$1(result, config);
+        return updateWithConfig(result, config);
     }
     static resolve(dataServices) {
         // final defaults
@@ -1803,7 +1749,7 @@ class DataService {
     }
 }
 DataService.prototype._$typeName = "DataService";
-function updateWithConfig$1(obj, dsConfig) {
+function updateWithConfig(obj, dsConfig) {
     if (dsConfig) {
         assertConfig(dsConfig)
             .whereParam("serviceName").isOptional()
@@ -1824,24 +1770,6 @@ A JsonResultsAdapter instance is used to provide custom extraction and parsing l
 This facility makes it possible for breeze to talk to virtually any web service and return objects that will be first class 'breeze' citizens.
 **/
 class JsonResultsAdapter {
-    /** @hidden @internal */
-    _$typeName; // actually put on prototype.
-    /** The name of this adapter.  This name is used to uniquely identify and locate this instance when an 'exported' JsonResultsAdapter is later imported. */
-    name;
-    /** A Function that is called once per query operation to extract the 'payload' from any json received over the wire.
-    This method has a default implementation which simply returns the "results" property from any json returned as a result of executing the query. */
-    extractResults; // TODO - refine
-    /** A function that is called once per save operation to extract the entities from any json received over the wire.  Must return an array.
-    This method has a default implementation which simply returns the "entities" property from any json returned as a result of executing the save. */
-    extractSaveResults;
-    /** A function that is called once per save operation to extract the key mappings from any json received over the wire.  Must return an array.
-  This method has a default implementation which simply returns the "keyMappings" property from any json returned as a result of executing the save. */
-    extractKeyMappings;
-    /** A function that is called once per save operation to extract any deleted keys from any json received over the wire.  Must return an array.
-    This method has a default implementation which is to simply returns the "deletedKeys" property from any json returned as a result of executing the save. */
-    extractDeletedKeys; // TODO: refine
-    /** A visitor method that will be called on each node of the returned payload. */
-    visitNode;
     /**
     JsonResultsAdapter constructor
   
@@ -1914,16 +1842,17 @@ const INT32_MIN = -2147483648;
 const INT32_MAX = 2147483647;
 const BYTE_MIN = 0;
 const BYTE_MAX = 255;
+const ɵ0$1 = function (context) {
+    if (context.property) {
+        return context.property.resolveProperty("displayName") || context.propertyName || context.property.name;
+    }
+    else {
+        return "Value";
+    }
+};
 // add common props and methods for every validator 'context' here.
 let rootContext = {
-    displayName: function (context) {
-        if (context.property) {
-            return context.property.resolveProperty("displayName") || context.propertyName || context.property.name;
-        }
-        else {
-            return "Value";
-        }
-    }
+    displayName: ɵ0$1
 };
 /**
 Instances of the Validator class provide the logic to validate another object and provide a description of any errors
@@ -2061,13 +1990,6 @@ of additional properties that will be automatically added to this object if not
 @dynamic
 **/
 class Validator {
-    /** @hidden @internal */
-    _$typeName; // on proto
-    name;
-    valFn;
-    context;
-    currentContext;
-    _baseContext;
     constructor(name, valFn, context) {
         // _baseContext is what will get serialized
         this._baseContext = context || {};
@@ -2216,491 +2138,491 @@ class Validator {
     static registerFactory(validatorFactory, name) {
         config.registerFunction(validatorFactory, "Validator." + name);
     }
-    /**
-    Map of standard error message templates keyed by validator name.
-    You can add to or modify this object to customize the template used for any validation error message.
-    @example
-        // v is this function is the value to be validated, in this case a "country" string.
-        var valFn = function (v) {
-            if (v == null) return true;
-            return (core.stringStartsWith(v, "US"));
-        };
-        var countryValidator = new Validator("countryIsUS", valFn, { displayName: "Country" });
-        Validator.messageTemplates.countryIsUS = "'%displayName%' must start with 'US'";
-        // This will have a similar effect to this
-        var countryValidator = new Validator("countryIsUS", valFn, {
-            displayName: "Country",
-            messageTemplate: "'%displayName%' must start with 'US'"
-        });
-    @property messageTemplates {Object}
-    @static
-    **/
-    static messageTemplates = {
-        bool: "'%displayName%' must be a 'true' or 'false' value",
-        creditCard: "The %displayName% is not a valid credit card number",
-        date: "'%displayName%' must be a date",
-        duration: "'%displayName%' must be a ISO8601 duration string, such as 'P3H24M60S'",
-        emailAddress: "The %displayName% '%value%' is not a valid email address",
-        guid: "'%displayName%' must be a GUID",
-        integer: "'%displayName%' must be an integer",
-        integerRange: "'%displayName%' must be an integer between the values of %minValue% and %maxValue%",
-        maxLength: "'%displayName%' must be a string with %maxLength% characters or less",
-        number: "'%displayName%' must be a number",
-        phone: "The %displayName% '%value%' is not a valid phone number",
-        regularExpression: "The %displayName% '%value%' does not match '%expression%'",
-        required: "'%displayName%' is required",
-        string: "'%displayName%' must be a string",
-        stringLength: "'%displayName%' must be a string with between %minLength% and %maxLength% characters",
-        url: "The %displayName% '%value%' is not a valid url"
-    };
-    /**
-    Returns a standard 'required value' Validator
-    @example
-        // Assume em1 is a preexisting EntityManager.
-        var custType = em1.metadataStore.getEntityType("Customer");
-        var regionProperty - custType.getProperty("Region");
-        // Makes "Region" on Customer a required property.
-        regionProperty.validators.push(Validator.required());
-        // or to allow empty strings
-        regionProperty.validators.push(Validator.required({ allowEmptyStrings: true }););
-    @method required
-    @static
-    @param context {Object}
-    @param [context.allowEmptyStrings] {Boolean} If this parameter is omitted or false then empty strings do NOT pass validation.
-    @return {Validator} A new Validator
-    **/
-    static required = function (context) {
-        let valFn = function (v, ctx) {
-            if (typeof v === "string") {
-                if (ctx && ctx.allowEmptyStrings)
-                    return true;
-                return v.length > 0;
-            }
-            else {
-                return v != null;
-            }
-        };
-        return new Validator("required", valFn, context);
+}
+/**
+Map of standard error message templates keyed by validator name.
+You can add to or modify this object to customize the template used for any validation error message.
+@example
+    // v is this function is the value to be validated, in this case a "country" string.
+    var valFn = function (v) {
+        if (v == null) return true;
+        return (core.stringStartsWith(v, "US"));
     };
-    /**
-    Returns a standard maximum string length Validator; the maximum length must be specified
-    @example
-        // Assume em1 is a preexisting EntityManager.
-        var custType = em1.metadataStore.getEntityType("Customer");
-        var regionProperty - custType.getProperty("Region");
-        // Validates that the value of the Region property on Customer will be less than or equal to 5 characters.
-        regionProperty.validators.push(Validator.maxLength( {maxLength: 5}));
-    @method maxLength
-    @static
-    @param context {Object}
-    @param context.maxLength {Integer}
-    @return {Validator} A new Validator
-    **/
-    static maxLength = function (context) {
-        let valFn = function (v, ctx) {
-            if (v == null)
+    var countryValidator = new Validator("countryIsUS", valFn, { displayName: "Country" });
+    Validator.messageTemplates.countryIsUS = "'%displayName%' must start with 'US'";
+    // This will have a similar effect to this
+    var countryValidator = new Validator("countryIsUS", valFn, {
+        displayName: "Country",
+        messageTemplate: "'%displayName%' must start with 'US'"
+    });
+@property messageTemplates {Object}
+@static
+**/
+Validator.messageTemplates = {
+    bool: "'%displayName%' must be a 'true' or 'false' value",
+    creditCard: "The %displayName% is not a valid credit card number",
+    date: "'%displayName%' must be a date",
+    duration: "'%displayName%' must be a ISO8601 duration string, such as 'P3H24M60S'",
+    emailAddress: "The %displayName% '%value%' is not a valid email address",
+    guid: "'%displayName%' must be a GUID",
+    integer: "'%displayName%' must be an integer",
+    integerRange: "'%displayName%' must be an integer between the values of %minValue% and %maxValue%",
+    maxLength: "'%displayName%' must be a string with %maxLength% characters or less",
+    number: "'%displayName%' must be a number",
+    phone: "The %displayName% '%value%' is not a valid phone number",
+    regularExpression: "The %displayName% '%value%' does not match '%expression%'",
+    required: "'%displayName%' is required",
+    string: "'%displayName%' must be a string",
+    stringLength: "'%displayName%' must be a string with between %minLength% and %maxLength% characters",
+    url: "The %displayName% '%value%' is not a valid url"
+};
+/**
+Returns a standard 'required value' Validator
+@example
+    // Assume em1 is a preexisting EntityManager.
+    var custType = em1.metadataStore.getEntityType("Customer");
+    var regionProperty - custType.getProperty("Region");
+    // Makes "Region" on Customer a required property.
+    regionProperty.validators.push(Validator.required());
+    // or to allow empty strings
+    regionProperty.validators.push(Validator.required({ allowEmptyStrings: true }););
+@method required
+@static
+@param context {Object}
+@param [context.allowEmptyStrings] {Boolean} If this parameter is omitted or false then empty strings do NOT pass validation.
+@return {Validator} A new Validator
+**/
+Validator.required = function (context) {
+    let valFn = function (v, ctx) {
+        if (typeof v === "string") {
+            if (ctx && ctx.allowEmptyStrings)
                 return true;
-            if (typeof (v) !== "string")
-                return false;
-            return v.length <= ctx.maxLength;
-        };
-        return new Validator("maxLength", valFn, context);
+            return v.length > 0;
+        }
+        else {
+            return v != null;
+        }
     };
-    /**
-    Returns a standard string length Validator; both minimum and maximum lengths must be specified.
-    @example
-        // Assume em1 is a preexisting EntityManager.
-        var custType = em1.metadataStore.getEntityType("Customer");
-        var regionProperty - custType.getProperty("Region");
-        // Validates that the value of the Region property on Customer will be
-        // between 2 and 5 characters
-        regionProperty.validators.push(Validator.stringLength( {minLength: 2, maxLength: 5});
-    @method stringLength
-    @static
-    @param context {Object}
-    @param context.maxLength {Integer}
-    @param context.minLength {Integer}
-    @return {Validator} A new Validator
-    **/
-    static stringLength = function (context) {
-        let valFn = function (v, ctx) {
-            if (v == null)
-                return true;
-            if (typeof (v) !== "string")
-                return false;
-            if (ctx.minLength != null && v.length < ctx.minLength)
-                return false;
-            if (ctx.maxLength != null && v.length > ctx.maxLength)
-                return false;
+    return new Validator("required", valFn, context);
+};
+/**
+Returns a standard maximum string length Validator; the maximum length must be specified
+@example
+    // Assume em1 is a preexisting EntityManager.
+    var custType = em1.metadataStore.getEntityType("Customer");
+    var regionProperty - custType.getProperty("Region");
+    // Validates that the value of the Region property on Customer will be less than or equal to 5 characters.
+    regionProperty.validators.push(Validator.maxLength( {maxLength: 5}));
+@method maxLength
+@static
+@param context {Object}
+@param context.maxLength {Integer}
+@return {Validator} A new Validator
+**/
+Validator.maxLength = function (context) {
+    let valFn = function (v, ctx) {
+        if (v == null)
             return true;
-        };
-        return new Validator("stringLength", valFn, context);
-    };
-    /**
-    Returns a standard string dataType Validator.
-    @example
-        // Assume em1 is a preexisting EntityManager.
-        var custType = em1.metadataStore.getEntityType("Customer");
-        var regionProperty - custType.getProperty("Region");
-        // Validates that the value of the Region property on Customer is a string.
-        regionProperty.validators.push(Validator.string());
-    @method string
-    @static
-    @return {Validator} A new Validator
-    **/
-    static string = function () {
-        let valFn = function (v) {
-            if (v == null)
-                return true;
-            return (typeof v === "string");
-        };
-        return new Validator("string", valFn);
-    };
-    /**
-    Returns a Guid data type Validator.
-    @example
-        // Assume em1 is a preexisting EntityManager.
-        var custType = em1.metadataStore.getEntityType("Customer");
-        var customerIdProperty - custType.getProperty("CustomerID");
-        // Validates that the value of the CustomerID property on Customer is a Guid.
-        customerIdProperty.validators.push(Validator.guid());
-    @method guid
-    @static
-    @return {Validator} A new Validator
-    **/
-    static guid = function () {
-        let valFn = function (v) {
-            if (v == null)
-                return true;
-            return core.isGuid(v);
-        };
-        return new Validator("guid", valFn);
-    };
-    /**
-    Returns a ISO 8601 duration string  Validator.
-    @example
-        // Assume em1 is a preexisting EntityManager.
-        var eventType = em1.metadataStore.getEntityType("Event");
-        var elapsedTimeProperty - eventType.getProperty("ElapsedTime");
-        // Validates that the value of the ElapsedTime property on Customer is a duration.
-        elapsedTimeProperty.validators.push(Validator.duration());
-    @method duration
-    @static
-    @return {Validator} A new Validator
-    **/
-    static duration = function () {
-        let valFn = function (v) {
-            if (v == null)
-                return true;
-            return core.isDuration(v);
-        };
-        return new Validator("duration", valFn);
-    };
-    /**
-    Returns a standard numeric data type Validator.
-    @example
-        // Assume em1 is a preexisting EntityManager.
-        var orderType = em1.metadataStore.getEntityType("Order");
-        var freightProperty - orderType.getProperty("Freight");
-        // Validates that the value of the Freight property on Order is a number.
-        freightProperty.validators.push(Validator.number());
-    @method number
-    @static
-    @return {Validator} A new Validator
-    **/
-    // TODO: may need to have seperate logic for single.
-    static number = function (context) {
-        let valFn = function (v, ctx) {
-            if (v == null)
-                return true;
-            if (typeof v === "string" && ctx && ctx.allowString) {
-                v = parseFloat(v);
-            }
-            return (typeof v === "number" && !isNaN(v));
-        };
-        return new Validator("number", valFn, context);
+        if (typeof (v) !== "string")
+            return false;
+        return v.length <= ctx.maxLength;
     };
-    static double = Validator.number;
-    static single = Validator.number;
-    /**
-    Returns a standard large integer data type - 64 bit - Validator.
-    @example
-        // Assume em1 is a preexisting EntityManager.
-        var orderType = em1.metadataStore.getEntityType("Order");
-        var freightProperty - orderType.getProperty("Freight");
-        // Validates that the value of the Freight property on Order is within the range of a 64 bit integer.
-        freightProperty.validators.push(Validator.int64());
-    @method int64
-    @static
-    @return {Validator} A new Validator
-    **/
-    static integer = function (context) {
-        let valFn = function (v, ctx) {
-            if (v == null)
-                return true;
-            if (typeof v === "string" && ctx && ctx.allowString) {
-                v = parseInt(v, 10);
-            }
-            return (typeof v === "number") && (!isNaN(v)) && Math.floor(v) === v;
-        };
-        return new Validator("integer", valFn, context);
+    return new Validator("maxLength", valFn, context);
+};
+/**
+Returns a standard string length Validator; both minimum and maximum lengths must be specified.
+@example
+    // Assume em1 is a preexisting EntityManager.
+    var custType = em1.metadataStore.getEntityType("Customer");
+    var regionProperty - custType.getProperty("Region");
+    // Validates that the value of the Region property on Customer will be
+    // between 2 and 5 characters
+    regionProperty.validators.push(Validator.stringLength( {minLength: 2, maxLength: 5});
+@method stringLength
+@static
+@param context {Object}
+@param context.maxLength {Integer}
+@param context.minLength {Integer}
+@return {Validator} A new Validator
+**/
+Validator.stringLength = function (context) {
+    let valFn = function (v, ctx) {
+        if (v == null)
+            return true;
+        if (typeof (v) !== "string")
+            return false;
+        if (ctx.minLength != null && v.length < ctx.minLength)
+            return false;
+        if (ctx.maxLength != null && v.length > ctx.maxLength)
+            return false;
+        return true;
     };
-    static int64 = Validator.integer;
-    /**
-    Returns a standard 32 bit integer data type Validator.
-    @example
-        // Assume em1 is a preexisting EntityManager.
-        var orderType = em1.metadataStore.getEntityType("Order");
-        var freightProperty - orderType.getProperty("Freight");
-        freightProperty.validators.push(Validator.int32());
-    @method int32
-    @static
-    @return {Validator} A new Validator
-    **/
-    static int32 = function (context) {
-        return intRangeValidatorCtor("int32", INT32_MIN, INT32_MAX, context)();
+    return new Validator("stringLength", valFn, context);
+};
+/**
+Returns a standard string dataType Validator.
+@example
+    // Assume em1 is a preexisting EntityManager.
+    var custType = em1.metadataStore.getEntityType("Customer");
+    var regionProperty - custType.getProperty("Region");
+    // Validates that the value of the Region property on Customer is a string.
+    regionProperty.validators.push(Validator.string());
+@method string
+@static
+@return {Validator} A new Validator
+**/
+Validator.string = function () {
+    let valFn = function (v) {
+        if (v == null)
+            return true;
+        return (typeof v === "string");
     };
-    /**
-    Returns a standard 16 bit integer data type Validator.
-    @example
-        // Assume em1 is a preexisting EntityManager.
-        var orderType = em1.metadataStore.getEntityType("Order");
-        var freightProperty - orderType.getProperty("Freight");
-        // Validates that the value of the Freight property on Order is within the range of a 16 bit integer.
-        freightProperty.validators.push(Validator.int16());
-    @method int16
-    @static
-    @return {Validator} A new Validator
-    **/
-    static int16 = function (context) {
-        return intRangeValidatorCtor("int16", INT16_MIN, INT16_MAX, context)();
+    return new Validator("string", valFn);
+};
+/**
+Returns a Guid data type Validator.
+@example
+    // Assume em1 is a preexisting EntityManager.
+    var custType = em1.metadataStore.getEntityType("Customer");
+    var customerIdProperty - custType.getProperty("CustomerID");
+    // Validates that the value of the CustomerID property on Customer is a Guid.
+    customerIdProperty.validators.push(Validator.guid());
+@method guid
+@static
+@return {Validator} A new Validator
+**/
+Validator.guid = function () {
+    let valFn = function (v) {
+        if (v == null)
+            return true;
+        return core.isGuid(v);
     };
-    /**
-    Returns a standard byte data type Validator. (This is a integer between 0 and 255 inclusive for js purposes).
-    @example
-        // Assume em1 is a preexisting EntityManager.
-        var orderType = em1.metadataStore.getEntityType("Order");
-        var freightProperty - orderType.getProperty("Freight");
-        // Validates that the value of the Freight property on Order is within the range of a 16 bit integer.
-        // Probably not a very good validation to place on the Freight property.
-        regionProperty.validators.push(Validator.byte());
-    @method byte
-    @static
-    @return {Validator} A new Validator
-    **/
-    static byte = function (context) {
-        return intRangeValidatorCtor("byte", BYTE_MIN, BYTE_MAX, context)();
+    return new Validator("guid", valFn);
+};
+/**
+Returns a ISO 8601 duration string  Validator.
+@example
+    // Assume em1 is a preexisting EntityManager.
+    var eventType = em1.metadataStore.getEntityType("Event");
+    var elapsedTimeProperty - eventType.getProperty("ElapsedTime");
+    // Validates that the value of the ElapsedTime property on Customer is a duration.
+    elapsedTimeProperty.validators.push(Validator.duration());
+@method duration
+@static
+@return {Validator} A new Validator
+**/
+Validator.duration = function () {
+    let valFn = function (v) {
+        if (v == null)
+            return true;
+        return core.isDuration(v);
     };
-    /**
-    Returns a standard boolean data type Validator.
-    @example
-        // Assume em1 is a preexisting EntityManager.
-        var productType = em1.metadataStore.getEntityType("Product");
-        var discontinuedProperty - productType.getProperty("Discontinued");
-        // Validates that the value of the Discontinued property on Product is a boolean
-        discontinuedProperty.validators.push(Validator.bool());
-    @method bool
-    @static
-    @return {Validator} A new Validator
-    **/
-    static bool = function () {
-        let valFn = function (v) {
-            if (v == null)
-                return true;
-            return (v === true) || (v === false);
-        };
-        return new Validator("bool", valFn);
+    return new Validator("duration", valFn);
+};
+/**
+Returns a standard numeric data type Validator.
+@example
+    // Assume em1 is a preexisting EntityManager.
+    var orderType = em1.metadataStore.getEntityType("Order");
+    var freightProperty - orderType.getProperty("Freight");
+    // Validates that the value of the Freight property on Order is a number.
+    freightProperty.validators.push(Validator.number());
+@method number
+@static
+@return {Validator} A new Validator
+**/
+// TODO: may need to have seperate logic for single.
+Validator.number = function (context) {
+    let valFn = function (v, ctx) {
+        if (v == null)
+            return true;
+        if (typeof v === "string" && ctx && ctx.allowString) {
+            v = parseFloat(v);
+        }
+        return (typeof v === "number" && !isNaN(v));
     };
-    static none = function () {
-        let valFn = function (v) {
+    return new Validator("number", valFn, context);
+};
+Validator.double = Validator.number;
+Validator.single = Validator.number;
+/**
+Returns a standard large integer data type - 64 bit - Validator.
+@example
+    // Assume em1 is a preexisting EntityManager.
+    var orderType = em1.metadataStore.getEntityType("Order");
+    var freightProperty - orderType.getProperty("Freight");
+    // Validates that the value of the Freight property on Order is within the range of a 64 bit integer.
+    freightProperty.validators.push(Validator.int64());
+@method int64
+@static
+@return {Validator} A new Validator
+**/
+Validator.integer = function (context) {
+    let valFn = function (v, ctx) {
+        if (v == null)
             return true;
-        };
-        return new Validator("none", valFn);
+        if (typeof v === "string" && ctx && ctx.allowString) {
+            v = parseInt(v, 10);
+        }
+        return (typeof v === "number") && (!isNaN(v)) && Math.floor(v) === v;
     };
-    /**
-    Returns a standard date data type Validator.
-    @example
-        // Assume em1 is a preexisting EntityManager.
-        var orderType = em1.metadataStore.getEntityType("Order");
-        var orderDateProperty - orderType.getProperty("OrderDate");
-        // Validates that the value of the OrderDate property on Order is a date
-        // Probably not a very good validation to place on the Freight property.
-        orderDateProperty.validators.push(Validator.date());
-    @method date
-    @static
-    @return {Validator} A new Validator
-    **/
-    static date = function () {
-        let valFn = function (v) {
-            if (v == null)
-                return true;
-            if (typeof v === "string") {
-                try {
-                    return !isNaN(Date.parse(v));
-                    // old code
-                    // return __isDate(new Date(v));
-                }
-                catch (e) {
-                    return false;
-                }
-            }
-            else {
-                return core.isDate(v);
-            }
-        };
-        return new Validator("date", valFn);
+    return new Validator("integer", valFn, context);
+};
+Validator.int64 = Validator.integer;
+/**
+Returns a standard 32 bit integer data type Validator.
+@example
+    // Assume em1 is a preexisting EntityManager.
+    var orderType = em1.metadataStore.getEntityType("Order");
+    var freightProperty - orderType.getProperty("Freight");
+    freightProperty.validators.push(Validator.int32());
+@method int32
+@static
+@return {Validator} A new Validator
+**/
+Validator.int32 = function (context) {
+    return intRangeValidatorCtor("int32", INT32_MIN, INT32_MAX, context)();
+};
+/**
+Returns a standard 16 bit integer data type Validator.
+@example
+    // Assume em1 is a preexisting EntityManager.
+    var orderType = em1.metadataStore.getEntityType("Order");
+    var freightProperty - orderType.getProperty("Freight");
+    // Validates that the value of the Freight property on Order is within the range of a 16 bit integer.
+    freightProperty.validators.push(Validator.int16());
+@method int16
+@static
+@return {Validator} A new Validator
+**/
+Validator.int16 = function (context) {
+    return intRangeValidatorCtor("int16", INT16_MIN, INT16_MAX, context)();
+};
+/**
+Returns a standard byte data type Validator. (This is a integer between 0 and 255 inclusive for js purposes).
+@example
+    // Assume em1 is a preexisting EntityManager.
+    var orderType = em1.metadataStore.getEntityType("Order");
+    var freightProperty - orderType.getProperty("Freight");
+    // Validates that the value of the Freight property on Order is within the range of a 16 bit integer.
+    // Probably not a very good validation to place on the Freight property.
+    regionProperty.validators.push(Validator.byte());
+@method byte
+@static
+@return {Validator} A new Validator
+**/
+Validator.byte = function (context) {
+    return intRangeValidatorCtor("byte", BYTE_MIN, BYTE_MAX, context)();
+};
+/**
+Returns a standard boolean data type Validator.
+@example
+    // Assume em1 is a preexisting EntityManager.
+    var productType = em1.metadataStore.getEntityType("Product");
+    var discontinuedProperty - productType.getProperty("Discontinued");
+    // Validates that the value of the Discontinued property on Product is a boolean
+    discontinuedProperty.validators.push(Validator.bool());
+@method bool
+@static
+@return {Validator} A new Validator
+**/
+Validator.bool = function () {
+    let valFn = function (v) {
+        if (v == null)
+            return true;
+        return (v === true) || (v === false);
     };
-    /**
-    Returns a credit card number validator
-    Performs a luhn algorithm checksum test for plausability
-    catches simple mistakes; only service knows for sure
-    @example
-        // Assume em is a preexisting EntityManager.
-        var personType = em.metadataStore.getEntityType("Person");
-        var creditCardProperty = personType.getProperty("creditCard");
-        // Validates that the value of the Person.creditCard property is credit card.
-        creditCardProperty.validators.push(Validator.creditCard());
-    @method creditCard
-    @static
-    @param [context] {Object} optional parameters to pass through to validation constructor
-    @return {Validator} A new Validator
-    **/
-    static creditCard = function (context) {
-        function valFn(v) {
-            if (v == null || v === '')
-                return true;
-            if (typeof (v) !== 'string')
-                return false;
-            v = v.replace(/(\-|\s)/g, ""); // remove dashes and spaces
-            if (!v || /\D/.test(v))
-                return false; // all digits, not empty
-            return luhn(v);
-        }
-        return new Validator('creditCard', valFn, context);
+    return new Validator("bool", valFn);
+};
+Validator.none = function () {
+    let valFn = function (v) {
+        return true;
     };
-    /**
-    Returns a regular expression validator; the expression must be specified
-    @example
-        // Add validator to a property. Assume em is a preexisting EntityManager.
-        var customerType = em.metadataStore.getEntityType("Customer");
-        var regionProperty = customerType.getProperty("Region");
-        // Validates that the value of Customer.Region is 2 char uppercase alpha.
-        regionProperty.validators.push(Validator.regularExpression( {expression: '^[A-Z]{2}$'} );
-    @method regularExpression
-    @static
-    @param context {Object}
-    @param context.expression {String} String form of the regular expression to apply
-    @return {Validator} A new Validator
-    **/
-    static regularExpression = function (context) {
-        function valFn(v, ctx) {
-            // do not invalidate if empty; use a separate required test
-            if (v == null || v === '')
-                return true;
-            if (typeof (v) !== 'string')
-                return false;
+    return new Validator("none", valFn);
+};
+/**
+Returns a standard date data type Validator.
+@example
+    // Assume em1 is a preexisting EntityManager.
+    var orderType = em1.metadataStore.getEntityType("Order");
+    var orderDateProperty - orderType.getProperty("OrderDate");
+    // Validates that the value of the OrderDate property on Order is a date
+    // Probably not a very good validation to place on the Freight property.
+    orderDateProperty.validators.push(Validator.date());
+@method date
+@static
+@return {Validator} A new Validator
+**/
+Validator.date = function () {
+    let valFn = function (v) {
+        if (v == null)
+            return true;
+        if (typeof v === "string") {
             try {
-                let re = new RegExp(ctx.expression);
-                return re.test(v);
+                return !isNaN(Date.parse(v));
+                // old code
+                // return __isDate(new Date(v));
             }
             catch (e) {
-                throw new Error('Missing or invalid expression parameter to regExp validator');
+                return false;
             }
         }
-        return new Validator('regularExpression', valFn, context);
-    };
-    /**
-    Returns the email address validator
-    @example
-        // Assume em is a preexisting EntityManager.
-        var personType = em.metadataStore.getEntityType("Person");
-        var emailProperty = personType.getProperty("email");
-        // Validates that the value of the Person.email property is an email address.
-        emailProperty.validators.push(Validator.emailAddress());
-    @method emailAddress
-    @static
-    @param [context] {Object} optional parameters to pass through to validation constructor
-    @return {Validator} A new Validator
-    **/
-    static emailAddress = function (context) {
-        // See https://github.com/srkirkland/DataAnnotationsExtensions/blob/master/DataAnnotationsExtensions/EmailAttribute.cs
-        let reEmailAddress = /^((([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+(\.([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+)*)|((\x22)((((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(([\x01-\x08\x0b\x0c\x0e-\x1f\x7f]|\x21|[\x23-\x5b]|[\x5d-\x7e]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(\\([\x01-\x09\x0b\x0c\x0d-\x7f]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]))))*(((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(\x22)))@((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)+(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.?$/i;
-        return makeRegExpValidator('emailAddress', reEmailAddress, null, context);
-    };
-    /**
-    Returns the phone validator
-    Provides basic assertions on the format and will help to eliminate most nonsense input
-    Matches:
-    International dialing prefix: {{}, +, 0, 0000} (with or without a trailing break character, if not '+': [-/. ])
-    > ((\+)|(0(\d+)?[-/.\s]))
-    Country code: {{}, 1, ..., 999} (with or without a trailing break character: [-/. ])
-    > [1-9]\d{,2}[-/.\s]?
-    Area code: {(0), ..., (000000), 0, ..., 000000} (with or without a trailing break character: [-/. ])
-    > ((\(\d{1,6}\)|\d{1,6})[-/.\s]?)?
-    Local: {0, ...}+ (with or without a trailing break character: [-/. ])
-    > (\d+[-/.\s]?)+\d+
-    @example
-        // Assume em is a preexisting EntityManager.
-        var customerType = em.metadataStore.getEntityType("Customer");
-        var phoneProperty = customerType.getProperty("phone");
-        // Validates that the value of the Customer.phone property is phone.
-        phoneProperty.validators.push(Validator.phone());
-    @method phone
-    @static
-    @param [context] {Object} optional parameters to pass through to validation constructor
-    @return {Validator} A new Validator
-    **/
-    static phone = function (context) {
-        // See https://github.com/srkirkland/DataAnnotationsExtensions/blob/master/DataAnnotationsExtensions/Expressions.cs
-        let rePhone = /^((\+|(0(\d+)?[-/.\s]?))[1-9]\d{0,2}[-/.\s]?)?((\(\d{1,6}\)|\d{1,6})[-/.\s]?)?(\d+[-/.\s]?)+\d+$/;
-        return makeRegExpValidator('phone', rePhone, null, context);
-    };
-    /**
-    Returns the URL (protocol required) validator
-    @example
-        // Assume em is a preexisting EntityManager.
-        var personType = em.metadataStore.getEntityType("Person");
-        var websiteProperty = personType.getProperty("website");
-        // Validates that the value of the Person.website property is a URL.
-        websiteProperty.validators.push(Validator.url());
-    @method url
-    @static
-    @param [context] {Object} optional parameters to pass through to validation constructor
-    @return {Validator} A new Validator
-    **/
-    static url = function (context) {
-        //See https://github.com/srkirkland/DataAnnotationsExtensions/blob/master/DataAnnotationsExtensions/UrlAttribute.cs
-        let reUrlProtocolRequired = /^(https?|ftp):\/\/(((([a-zA-Z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-fA-F]{2})|[!\$&'\(\)\*\+,;=]|:)*@)?(((\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5]))|([a-zA-Z][\-a-zA-Z0-9]*)|((([a-zA-Z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-zA-Z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-zA-Z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-zA-Z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)+(([a-zA-Z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-zA-Z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-zA-Z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-zA-Z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.?)(:\d*)?)(\/((([a-zA-Z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-fA-F]{2})|[!\$&'\(\)\*\+,;=]|:|@)+(\/(([a-zA-Z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-fA-F]{2})|[!\$&'\(\)\*\+,;=]|:|@)*)*)?)?(\?((([a-zA-Z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-fA-F]{2})|[!\$&'\(\)\*\+,;=]|:|@)|[\uE000-\uF8FF]|\/|\?)*)?(\#((([a-zA-Z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-fA-F]{2})|[!\$&'\(\)\*\+,;=]|:|@)|\/|\?)*)?$/;
-        return makeRegExpValidator('url', reUrlProtocolRequired, null, context);
+        else {
+            return core.isDate(v);
+        }
     };
-    /**
-    Creates a regular expression validator with a fixed expression.
-    Many of the stock validators are built with this factory method.
-    Their expressions are often derived from
-    https://github.com/srkirkland/DataAnnotationsExtensions/blob/master/DataAnnotationsExtensions
-    You can try many of them at http://dataannotationsextensions.org/
-    @example
-        // Make a zipcode validator
-        function zipValidator = Validator.makeRegExpValidator(
-        "zipVal,
-        /^\d{5}([\-]\d{4})?$/,
-        "The %displayName% '%value%' is not a valid U.S. zipcode");
-        // Register it.
-        Validator.register(zipValidator);
-        // Add it to a data property. Assume em is a preexisting EntityManager.
-        var custType = em.metadataStore.getEntityType("Customer");
-        var zipProperty = custType.getProperty("PostalCode");
-        zipProperty.validators.push(zipValidator);
-    @method makeRegExpValidator
-    @static
-    @param validatorName {String} name of this validator
-    @param expression {String | RegExp} regular expression to apply
-    @param [defaultMessage] {String} default message for failed validations
-    @param [context] {Object} optional parameters to pass through to validation constructor
-    @return {Validator} A new Validator
-    **/
-    static makeRegExpValidator = makeRegExpValidator;
-}
+    return new Validator("date", valFn);
+};
+/**
+Returns a credit card number validator
+Performs a luhn algorithm checksum test for plausability
+catches simple mistakes; only service knows for sure
+@example
+    // Assume em is a preexisting EntityManager.
+    var personType = em.metadataStore.getEntityType("Person");
+    var creditCardProperty = personType.getProperty("creditCard");
+    // Validates that the value of the Person.creditCard property is credit card.
+    creditCardProperty.validators.push(Validator.creditCard());
+@method creditCard
+@static
+@param [context] {Object} optional parameters to pass through to validation constructor
+@return {Validator} A new Validator
+**/
+Validator.creditCard = function (context) {
+    function valFn(v) {
+        if (v == null || v === '')
+            return true;
+        if (typeof (v) !== 'string')
+            return false;
+        v = v.replace(/(\-|\s)/g, ""); // remove dashes and spaces
+        if (!v || /\D/.test(v))
+            return false; // all digits, not empty
+        return luhn(v);
+    }
+    return new Validator('creditCard', valFn, context);
+};
+/**
+Returns a regular expression validator; the expression must be specified
+@example
+    // Add validator to a property. Assume em is a preexisting EntityManager.
+    var customerType = em.metadataStore.getEntityType("Customer");
+    var regionProperty = customerType.getProperty("Region");
+    // Validates that the value of Customer.Region is 2 char uppercase alpha.
+    regionProperty.validators.push(Validator.regularExpression( {expression: '^[A-Z]{2}$'} );
+@method regularExpression
+@static
+@param context {Object}
+@param context.expression {String} String form of the regular expression to apply
+@return {Validator} A new Validator
+**/
+Validator.regularExpression = function (context) {
+    function valFn(v, ctx) {
+        // do not invalidate if empty; use a separate required test
+        if (v == null || v === '')
+            return true;
+        if (typeof (v) !== 'string')
+            return false;
+        try {
+            let re = new RegExp(ctx.expression);
+            return re.test(v);
+        }
+        catch (e) {
+            throw new Error('Missing or invalid expression parameter to regExp validator');
+        }
+    }
+    return new Validator('regularExpression', valFn, context);
+};
+/**
+Returns the email address validator
+@example
+    // Assume em is a preexisting EntityManager.
+    var personType = em.metadataStore.getEntityType("Person");
+    var emailProperty = personType.getProperty("email");
+    // Validates that the value of the Person.email property is an email address.
+    emailProperty.validators.push(Validator.emailAddress());
+@method emailAddress
+@static
+@param [context] {Object} optional parameters to pass through to validation constructor
+@return {Validator} A new Validator
+**/
+Validator.emailAddress = function (context) {
+    // See https://github.com/srkirkland/DataAnnotationsExtensions/blob/master/DataAnnotationsExtensions/EmailAttribute.cs
+    let reEmailAddress = /^((([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+(\.([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+)*)|((\x22)((((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(([\x01-\x08\x0b\x0c\x0e-\x1f\x7f]|\x21|[\x23-\x5b]|[\x5d-\x7e]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(\\([\x01-\x09\x0b\x0c\x0d-\x7f]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]))))*(((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(\x22)))@((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)+(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.?$/i;
+    return makeRegExpValidator('emailAddress', reEmailAddress, null, context);
+};
+/**
+Returns the phone validator
+Provides basic assertions on the format and will help to eliminate most nonsense input
+Matches:
+International dialing prefix: {{}, +, 0, 0000} (with or without a trailing break character, if not '+': [-/. ])
+> ((\+)|(0(\d+)?[-/.\s]))
+Country code: {{}, 1, ..., 999} (with or without a trailing break character: [-/. ])
+> [1-9]\d{,2}[-/.\s]?
+Area code: {(0), ..., (000000), 0, ..., 000000} (with or without a trailing break character: [-/. ])
+> ((\(\d{1,6}\)|\d{1,6})[-/.\s]?)?
+Local: {0, ...}+ (with or without a trailing break character: [-/. ])
+> (\d+[-/.\s]?)+\d+
+@example
+    // Assume em is a preexisting EntityManager.
+    var customerType = em.metadataStore.getEntityType("Customer");
+    var phoneProperty = customerType.getProperty("phone");
+    // Validates that the value of the Customer.phone property is phone.
+    phoneProperty.validators.push(Validator.phone());
+@method phone
+@static
+@param [context] {Object} optional parameters to pass through to validation constructor
+@return {Validator} A new Validator
+**/
+Validator.phone = function (context) {
+    // See https://github.com/srkirkland/DataAnnotationsExtensions/blob/master/DataAnnotationsExtensions/Expressions.cs
+    let rePhone = /^((\+|(0(\d+)?[-/.\s]?))[1-9]\d{0,2}[-/.\s]?)?((\(\d{1,6}\)|\d{1,6})[-/.\s]?)?(\d+[-/.\s]?)+\d+$/;
+    return makeRegExpValidator('phone', rePhone, null, context);
+};
+/**
+Returns the URL (protocol required) validator
+@example
+    // Assume em is a preexisting EntityManager.
+    var personType = em.metadataStore.getEntityType("Person");
+    var websiteProperty = personType.getProperty("website");
+    // Validates that the value of the Person.website property is a URL.
+    websiteProperty.validators.push(Validator.url());
+@method url
+@static
+@param [context] {Object} optional parameters to pass through to validation constructor
+@return {Validator} A new Validator
+**/
+Validator.url = function (context) {
+    //See https://github.com/srkirkland/DataAnnotationsExtensions/blob/master/DataAnnotationsExtensions/UrlAttribute.cs
+    let reUrlProtocolRequired = /^(https?|ftp):\/\/(((([a-zA-Z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-fA-F]{2})|[!\$&'\(\)\*\+,;=]|:)*@)?(((\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5]))|([a-zA-Z][\-a-zA-Z0-9]*)|((([a-zA-Z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-zA-Z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-zA-Z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-zA-Z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)+(([a-zA-Z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-zA-Z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-zA-Z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-zA-Z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.?)(:\d*)?)(\/((([a-zA-Z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-fA-F]{2})|[!\$&'\(\)\*\+,;=]|:|@)+(\/(([a-zA-Z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-fA-F]{2})|[!\$&'\(\)\*\+,;=]|:|@)*)*)?)?(\?((([a-zA-Z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-fA-F]{2})|[!\$&'\(\)\*\+,;=]|:|@)|[\uE000-\uF8FF]|\/|\?)*)?(\#((([a-zA-Z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-fA-F]{2})|[!\$&'\(\)\*\+,;=]|:|@)|\/|\?)*)?$/;
+    return makeRegExpValidator('url', reUrlProtocolRequired, null, context);
+};
+/**
+Creates a regular expression validator with a fixed expression.
+Many of the stock validators are built with this factory method.
+Their expressions are often derived from
+https://github.com/srkirkland/DataAnnotationsExtensions/blob/master/DataAnnotationsExtensions
+You can try many of them at http://dataannotationsextensions.org/
+@example
+    // Make a zipcode validator
+    function zipValidator = Validator.makeRegExpValidator(
+    "zipVal,
+    /^\d{5}([\-]\d{4})?$/,
+    "The %displayName% '%value%' is not a valid U.S. zipcode");
+    // Register it.
+    Validator.register(zipValidator);
+    // Add it to a data property. Assume em is a preexisting EntityManager.
+    var custType = em.metadataStore.getEntityType("Customer");
+    var zipProperty = custType.getProperty("PostalCode");
+    zipProperty.validators.push(zipValidator);
+@method makeRegExpValidator
+@static
+@param validatorName {String} name of this validator
+@param expression {String | RegExp} regular expression to apply
+@param [defaultMessage] {String} default message for failed validations
+@param [context] {Object} optional parameters to pass through to validation constructor
+@return {Validator} A new Validator
+**/
+Validator.makeRegExpValidator = makeRegExpValidator;
 Validator.prototype._$typeName = "Validator";
 // register all validators
 Error['x'] = core.objectForEach(Validator, function (key, value) {
@@ -2787,14 +2709,7 @@ function makeRegExpValidator(validatorName, expression, defaultMessage, context)
     };
     return new Validator(validatorName, valFn, context);
 }
-// http://rosettacode.org/wiki/Luhn_test_of_credit_card_numbers#JavaScript
-// function luhn(a: string, b: number, c: number, d: number, e: number) {
-//   for (d = +a[b = a.length - 1], e = 0; b--; ) {
-//     c = +a[b], d += ++e % 2 ? 2 * c % 10 + (c > 4) : c;
-//   }
-//   return !(d % 10);
-// };
-let luhn = (function () {
+const ɵ1 = function () {
     let luhnArr = [0, 2, 4, 6, 8, 1, 3, 5, 7, 9];
     return function (str) {
         let counter = 0;
@@ -2809,7 +2724,15 @@ let luhn = (function () {
         }
         return (counter % 10 === 0);
     };
-})();
+};
+// http://rosettacode.org/wiki/Luhn_test_of_credit_card_numbers#JavaScript
+// function luhn(a: string, b: number, c: number, d: number, e: number) {
+//   for (d = +a[b = a.length - 1], e = 0; b--; ) {
+//     c = +a[b], d += ++e % 2 ? 2 * c % 10 + (c > 4) : c;
+//   }
+//   return !(d % 10);
+// };
+let luhn = (ɵ1)();
 /**
 A ValidationError is used to describe a failed validation.
 
@@ -2825,13 +2748,6 @@ Constructs a new ValidationError
 @param [key] {String} An optional key used to define a key for this error. One will be created automatically if not provided here.
 **/
 class ValidationError {
-    validator;
-    key;
-    context;
-    errorMessage;
-    property; // IProperty
-    propertyName;
-    isServerError;
     constructor(validator, context, errorMessage, key) {
         // Error is with isInstanceOf(Validator)
         assertParam(validator, "validator").isOptional().isInstanceOf(Validator).check();
@@ -2913,131 +2829,6 @@ DataType is an 'Enum' containing all of the supported data types.
 @dynamic
 **/
 class DataType extends BreezeEnum {
-    static parseDateFromServer = (value) => DataType.parseDateAsUTC(value);
-    // same effect as above but doesn't give right TSDOC.
-    // static parseDateFromServer = DataType.parseDateAsUTC;
-    /** @hidden @internal */
-    static constants;
-    static String = new DataType({
-        defaultValue: "",
-        parse: coerceToString,
-        fmtOData: fmtString,
-        getNext: getNextString
-    });
-    static Int64 = new DataType({
-        defaultValue: 0,
-        isNumeric: true,
-        isInteger: true,
-        quoteJsonOData: true,
-        parse: coerceToInt,
-        fmtOData: makeFloatFmt("L"),
-        getNext: getNextNumber
-    });
-    static Int32 = new DataType({
-        defaultValue: 0,
-        isNumeric: true,
-        isInteger: true,
-        parse: coerceToInt,
-        fmtOData: fmtInt,
-        getNext: getNextNumber
-    });
-    static Int16 = new DataType({
-        defaultValue: 0,
-        isNumeric: true,
-        isInteger: true,
-        parse: coerceToInt,
-        fmtOData: fmtInt,
-        getNext: getNextNumber
-    });
-    static Byte = new DataType({
-        defaultValue: 0,
-        isNumeric: true,
-        isInteger: true,
-        parse: coerceToInt,
-        fmtOData: fmtInt
-    });
-    static Decimal = new DataType({
-        defaultValue: 0,
-        isNumeric: true,
-        quoteJsonOData: true,
-        isFloat: true,
-        parse: coerceToFloat,
-        fmtOData: makeFloatFmt("m"),
-        getNext: getNextNumber
-    });
-    static Double = new DataType({
-        defaultValue: 0,
-        isNumeric: true,
-        isFloat: true,
-        parse: coerceToFloat,
-        fmtOData: makeFloatFmt("d"),
-        getNext: getNextNumber
-    });
-    static Single = new DataType({
-        defaultValue: 0,
-        isNumeric: true,
-        isFloat: true,
-        parse: coerceToFloat,
-        fmtOData: makeFloatFmt("f"),
-        getNext: getNextNumber
-    });
-    static DateOnly = new DataType({
-        defaultValue: new Date(1900, 0, 1),
-        isDate: true,
-        parse: coerceToDateOnly,
-        parseRawValue: parseRawDateOnly,
-        normalize: function (value) { return value && value.getTime && (new Date(value.getYear(), value.getMonth(), value.getDate())).getTime(); },
-        fmtOData: fmtDateOnly,
-        getNext: getNextDateTime,
-        getConcurrencyValue: getConcurrencyDateTime
-    });
-    static DateTime = new DataType({
-        defaultValue: new Date(1900, 0, 1),
-        isDate: true,
-        parse: coerceToDate,
-        parseRawValue: parseRawDate,
-        normalize: function (value) { return value && value.getTime && value.getTime(); },
-        fmtOData: fmtDateTime,
-        getNext: getNextDateTime,
-        getConcurrencyValue: getConcurrencyDateTime
-    });
-    static DateTimeOffset = new DataType({
-        defaultValue: new Date(1900, 0, 1),
-        isDate: true,
-        parse: coerceToDate,
-        parseRawValue: parseRawDate,
-        normalize: function (value) { return value && value.getTime && value.getTime(); },
-        fmtOData: fmtDateTimeOffset,
-        getNext: getNextDateTime,
-        getConcurrencyValue: getConcurrencyDateTime
-    });
-    static Time = new DataType({
-        defaultValue: "PT0S",
-        fmtOData: fmtTime,
-        parseRawValue: DataType.parseTimeFromServer
-    });
-    static Boolean = new DataType({
-        defaultValue: false,
-        parse: coerceToBool,
-        fmtOData: fmtBoolean
-    });
-    static Guid = new DataType({
-        defaultValue: "00000000-0000-0000-0000-000000000000",
-        parse: coerceToGuid,
-        fmtOData: fmtGuid,
-        getNext: getNextGuid,
-        parseRawValue: function (val) { return val.toLowerCase(); },
-        getConcurrencyValue: core.getUuid
-    });
-    static Binary = new DataType({
-        defaultValue: null,
-        fmtOData: fmtBinary,
-        parseRawValue: parseRawBinary
-    });
-    static Undefined = new DataType({
-        defaultValue: undefined,
-        fmtOData: fmtUndefined
-    });
     static getComparableFn(dataType) {
         if (dataType && dataType.normalize) {
             return dataType.normalize;
@@ -3158,6 +2949,127 @@ class DataType extends BreezeEnum {
         };
     }
 }
+DataType.parseDateFromServer = (value) => DataType.parseDateAsUTC(value);
+DataType.String = new DataType({
+    defaultValue: "",
+    parse: coerceToString,
+    fmtOData: fmtString,
+    getNext: getNextString
+});
+DataType.Int64 = new DataType({
+    defaultValue: 0,
+    isNumeric: true,
+    isInteger: true,
+    quoteJsonOData: true,
+    parse: coerceToInt,
+    fmtOData: makeFloatFmt("L"),
+    getNext: getNextNumber
+});
+DataType.Int32 = new DataType({
+    defaultValue: 0,
+    isNumeric: true,
+    isInteger: true,
+    parse: coerceToInt,
+    fmtOData: fmtInt,
+    getNext: getNextNumber
+});
+DataType.Int16 = new DataType({
+    defaultValue: 0,
+    isNumeric: true,
+    isInteger: true,
+    parse: coerceToInt,
+    fmtOData: fmtInt,
+    getNext: getNextNumber
+});
+DataType.Byte = new DataType({
+    defaultValue: 0,
+    isNumeric: true,
+    isInteger: true,
+    parse: coerceToInt,
+    fmtOData: fmtInt
+});
+DataType.Decimal = new DataType({
+    defaultValue: 0,
+    isNumeric: true,
+    quoteJsonOData: true,
+    isFloat: true,
+    parse: coerceToFloat,
+    fmtOData: makeFloatFmt("m"),
+    getNext: getNextNumber
+});
+DataType.Double = new DataType({
+    defaultValue: 0,
+    isNumeric: true,
+    isFloat: true,
+    parse: coerceToFloat,
+    fmtOData: makeFloatFmt("d"),
+    getNext: getNextNumber
+});
+DataType.Single = new DataType({
+    defaultValue: 0,
+    isNumeric: true,
+    isFloat: true,
+    parse: coerceToFloat,
+    fmtOData: makeFloatFmt("f"),
+    getNext: getNextNumber
+});
+DataType.DateOnly = new DataType({
+    defaultValue: new Date(1900, 0, 1),
+    isDate: true,
+    parse: coerceToDateOnly,
+    parseRawValue: parseRawDateOnly,
+    normalize: function (value) { return value && value.getTime && (new Date(value.getYear(), value.getMonth(), value.getDate())).getTime(); },
+    fmtOData: fmtDateOnly,
+    getNext: getNextDateTime,
+    getConcurrencyValue: getConcurrencyDateTime
+});
+DataType.DateTime = new DataType({
+    defaultValue: new Date(1900, 0, 1),
+    isDate: true,
+    parse: coerceToDate,
+    parseRawValue: parseRawDate,
+    normalize: function (value) { return value && value.getTime && value.getTime(); },
+    fmtOData: fmtDateTime,
+    getNext: getNextDateTime,
+    getConcurrencyValue: getConcurrencyDateTime
+});
+DataType.DateTimeOffset = new DataType({
+    defaultValue: new Date(1900, 0, 1),
+    isDate: true,
+    parse: coerceToDate,
+    parseRawValue: parseRawDate,
+    normalize: function (value) { return value && value.getTime && value.getTime(); },
+    fmtOData: fmtDateTimeOffset,
+    getNext: getNextDateTime,
+    getConcurrencyValue: getConcurrencyDateTime
+});
+DataType.Time = new DataType({
+    defaultValue: "PT0S",
+    fmtOData: fmtTime,
+    parseRawValue: DataType.parseTimeFromServer
+});
+DataType.Boolean = new DataType({
+    defaultValue: false,
+    parse: coerceToBool,
+    fmtOData: fmtBoolean
+});
+DataType.Guid = new DataType({
+    defaultValue: "00000000-0000-0000-0000-000000000000",
+    parse: coerceToGuid,
+    fmtOData: fmtGuid,
+    getNext: getNextGuid,
+    parseRawValue: function (val) { return val.toLowerCase(); },
+    getConcurrencyValue: core.getUuid
+});
+DataType.Binary = new DataType({
+    defaultValue: null,
+    fmtOData: fmtBinary,
+    parseRawValue: parseRawBinary
+});
+DataType.Undefined = new DataType({
+    defaultValue: undefined,
+    fmtOData: fmtUndefined
+});
 DataType.prototype._$typeName = "DataType";
 Error['x'] = DataType._resetConstants();
 Error['x'] = DataType.resolveSymbols();
@@ -3415,16 +3327,6 @@ function parseRawBinary(val) {
 EntityState is an 'Enum' containing all of the valid states for an 'Entity'.
 **/
 class EntityState extends BreezeEnum {
-    /** The 'Unchanged' state. **/
-    static Unchanged = new EntityState();
-    /**  The 'Added' state.  **/
-    static Added = new EntityState();
-    /**  The 'Modified' state.   **/
-    static Modified = new EntityState();
-    /**  The 'Deleted' state.  **/
-    static Deleted = new EntityState();
-    /**  The 'Detached' state.  **/
-    static Detached = new EntityState();
     /**
     Returns whether an entityState instance is EntityState.Unchanged.
     >     var es = anEntity.entityAspect.entityState;
@@ -3514,6 +3416,16 @@ class EntityState extends BreezeEnum {
             this === EntityState.Deleted;
     }
 }
+/** The 'Unchanged' state. **/
+EntityState.Unchanged = new EntityState();
+/**  The 'Added' state.  **/
+EntityState.Added = new EntityState();
+/**  The 'Modified' state.   **/
+EntityState.Modified = new EntityState();
+/**  The 'Deleted' state.  **/
+EntityState.Deleted = new EntityState();
+/**  The 'Detached' state.  **/
+EntityState.Detached = new EntityState();
 EntityState.prototype._$typeName = "EntityState";
 Error['x'] = EntityState.resolveSymbols();
 
@@ -3521,30 +3433,6 @@ Error['x'] = EntityState.resolveSymbols();
  
 */
 class EntityAction extends BreezeEnum {
-    /** Entity was attached via an AttachEntity call. */
-    static Attach = new EntityAction({ _isAttach: true });
-    /**  Entity was attached as a result of a query. */
-    static AttachOnQuery = new EntityAction({ _isAttach: true });
-    /**  Entity was attached as a result of an import. */
-    static AttachOnImport = new EntityAction({ _isAttach: true });
-    /** Entity was detached */
-    static Detach = new EntityAction({ _isDetach: true });
-    /** Properties on the entity were merged as a result of a query. */
-    static MergeOnQuery = new EntityAction({ _isModification: true });
-    /** Properties on the entity were merged as a result of an import. */
-    static MergeOnImport = new EntityAction({ _isModification: true });
-    /** Properties on the entity were merged as a result of a save */
-    static MergeOnSave = new EntityAction({ _isModification: true });
-    /** A property on the entity was changed. */
-    static PropertyChange = new EntityAction({ _isModification: true });
-    /** The EntityState of the entity was changed. */
-    static EntityStateChange = new EntityAction();
-    /** AcceptChanges was called on the entity, or its entityState was set to Unmodified. */
-    static AcceptChanges = new EntityAction();
-    /** RejectChanges was called on the entity. */
-    static RejectChanges = new EntityAction({ _isModification: true });
-    /** The EntityManager was cleared.  All entities detached. */
-    static Clear = new EntityAction({ _isDetach: true });
     /** Is this an 'attach' operation? ( Attach, AttachOnQuery or AttachOnImport) */
     isAttach() {
         return !!this._isAttach;
@@ -3558,6 +3446,30 @@ class EntityAction extends BreezeEnum {
         return !!this._isModification;
     }
 }
+/** Entity was attached via an AttachEntity call. */
+EntityAction.Attach = new EntityAction({ _isAttach: true });
+/**  Entity was attached as a result of a query. */
+EntityAction.AttachOnQuery = new EntityAction({ _isAttach: true });
+/**  Entity was attached as a result of an import. */
+EntityAction.AttachOnImport = new EntityAction({ _isAttach: true });
+/** Entity was detached */
+EntityAction.Detach = new EntityAction({ _isDetach: true });
+/** Properties on the entity were merged as a result of a query. */
+EntityAction.MergeOnQuery = new EntityAction({ _isModification: true });
+/** Properties on the entity were merged as a result of an import. */
+EntityAction.MergeOnImport = new EntityAction({ _isModification: true });
+/** Properties on the entity were merged as a result of a save */
+EntityAction.MergeOnSave = new EntityAction({ _isModification: true });
+/** A property on the entity was changed. */
+EntityAction.PropertyChange = new EntityAction({ _isModification: true });
+/** The EntityState of the entity was changed. */
+EntityAction.EntityStateChange = new EntityAction();
+/** AcceptChanges was called on the entity, or its entityState was set to Unmodified. */
+EntityAction.AcceptChanges = new EntityAction();
+/** RejectChanges was called on the entity. */
+EntityAction.RejectChanges = new EntityAction({ _isModification: true });
+/** The EntityManager was cleared.  All entities detached. */
+EntityAction.Clear = new EntityAction({ _isDetach: true });
 EntityAction.prototype._$typeName = "EntityAction";
 Error['x'] = EntityAction.resolveSymbols();
 
@@ -3567,19 +3479,6 @@ An EntityKey is an object that represents the unique identity of an entity.  Ent
 
 **/
 class EntityKey {
-    /** @hidden @internal */
-    _$typeName; // actually placed on prototype
-    /** @hidden @internal */
-    static ENTITY_KEY_DELIMITER = ":::";
-    /**  The 'EntityType' that this is a key for. __Read Only__ */
-    entityType;
-    /**  An array of the values for this key. This will usually only have a single element,
-    unless the entity type has a multipart key. __Read Only__ */
-    values;
-    /** @hidden @internal */
-    _keyInGroup;
-    /** @hidden @internal */
-    _subtypes;
     /**
     Constructs a new EntityKey.  Each entity within an EntityManager will have a unique EntityKey.
     >     // assume em1 is an EntityManager containing a number of existing entities.
@@ -3682,6 +3581,8 @@ class EntityKey {
         return keyValues.join(EntityKey.ENTITY_KEY_DELIMITER);
     }
 }
+/** @hidden @internal */
+EntityKey.ENTITY_KEY_DELIMITER = ":::";
 EntityKey.prototype._$typeName = "EntityKey";
 
 /**
@@ -3691,69 +3592,53 @@ MergeStrategy is an 'Enum' that determines how entities are merged into an Entit
 @static
 **/
 class MergeStrategy extends BreezeEnum {
-    /**
-    MergeStrategy.PreserveChanges updates the cached entity with the incoming values unless the cached entity is in a changed
-    state (added, modified, deleted) in which case the incoming values are ignored. The updated cached entity’s EntityState will
-    remain [[EntityState.Unchanged]] unless you’re importing entities in which case the new EntityState will
-    be that of the imported entities.
-    **/
-    static PreserveChanges = new MergeStrategy();
-    /**
-    MergeStrategy.OverwriteChanges always updates the cached entity with incoming values even if the entity is in
-    a changed state (added, modified, deleted). After the merge, the pending changes are lost.
-    The new EntityState will be  [[EntityState/Unchanged]] unless you’re importing entities
-    in which case the new EntityState will be that of the imported entities.
-    **/
-    static OverwriteChanges = new MergeStrategy();
-    /**
-    SkipMerge is used to ignore incoming values. Adds the incoming entity to the cache only if there is no cached entity with the same key.
-    This is the fastest merge strategy but your existing cached data will remain “stale”.
-    **/
-    static SkipMerge = new MergeStrategy();
-    /**
-    Disallowed is used to throw an exception if there is an incoming entity with the same key as an entity already in the cache.
-    Use this strategy when you want to be sure that the incoming entity is not already in cache.
-    This is the default strategy for EntityManager.attachEntity.
-    **/
-    static Disallowed = new MergeStrategy();
 }
+/**
+MergeStrategy.PreserveChanges updates the cached entity with the incoming values unless the cached entity is in a changed
+state (added, modified, deleted) in which case the incoming values are ignored. The updated cached entity’s EntityState will
+remain [[EntityState.Unchanged]] unless you’re importing entities in which case the new EntityState will
+be that of the imported entities.
+**/
+MergeStrategy.PreserveChanges = new MergeStrategy();
+/**
+MergeStrategy.OverwriteChanges always updates the cached entity with incoming values even if the entity is in
+a changed state (added, modified, deleted). After the merge, the pending changes are lost.
+The new EntityState will be  [[EntityState/Unchanged]] unless you’re importing entities
+in which case the new EntityState will be that of the imported entities.
+**/
+MergeStrategy.OverwriteChanges = new MergeStrategy();
+/**
+SkipMerge is used to ignore incoming values. Adds the incoming entity to the cache only if there is no cached entity with the same key.
+This is the fastest merge strategy but your existing cached data will remain “stale”.
+**/
+MergeStrategy.SkipMerge = new MergeStrategy();
+/**
+Disallowed is used to throw an exception if there is an incoming entity with the same key as an entity already in the cache.
+Use this strategy when you want to be sure that the incoming entity is not already in cache.
+This is the default strategy for EntityManager.attachEntity.
+**/
+MergeStrategy.Disallowed = new MergeStrategy();
 MergeStrategy.prototype._$typeName = "MergeStrategy";
 Error['x'] = MergeStrategy.resolveSymbols();
 /**
 FetchStrategy is an 'Enum' that determines how and where entities are retrieved from as a result of a query.
 **/
 class FetchStrategy extends BreezeEnum {
-    /**
-    FromServer is used to tell the query to execute the query against a remote data source on the server.
-    **/
-    static FromServer = new FetchStrategy();
-    /**
-    FromLocalCache is used to tell the query to execute the query against a local EntityManager instead of going to a remote server.
-    **/
-    static FromLocalCache = new FetchStrategy();
 }
+/**
+FromServer is used to tell the query to execute the query against a remote data source on the server.
+**/
+FetchStrategy.FromServer = new FetchStrategy();
+/**
+FromLocalCache is used to tell the query to execute the query against a local EntityManager instead of going to a remote server.
+**/
+FetchStrategy.FromLocalCache = new FetchStrategy();
 FetchStrategy.prototype._$typeName = "FetchStrategy";
 Error['x'] = FetchStrategy.resolveSymbols();
 /**
 A QueryOptions instance is used to specify the 'options' under which a query will occur.
 **/
 class QueryOptions {
-    /** @hidden @internal */
-    _$typeName;
-    /** The [[FetchStrategy]] to use with any queries. __Read Only__ */
-    fetchStrategy;
-    /** The [[MergeStrategy]] to use with any queries. __Read Only__ */
-    mergeStrategy;
-    /** Whether to include cached deleted entities in a query result (false by default). __Read Only__ */
-    includeDeleted;
-    /**
-    The default instance for use whenever QueryOptions are not specified.
-    **/
-    static defaultInstance = new QueryOptions({
-        fetchStrategy: FetchStrategy.FromServer,
-        mergeStrategy: MergeStrategy.PreserveChanges,
-        includeDeleted: false
-    });
     /**
     QueryOptions constructor
     >     var newQo = new QueryOptions( { mergeStrategy: MergeStrategy.OverwriteChanges });
@@ -3839,6 +3724,14 @@ class QueryOptions {
         return obj;
     }
 }
+/**
+The default instance for use whenever QueryOptions are not specified.
+**/
+QueryOptions.defaultInstance = new QueryOptions({
+    fetchStrategy: FetchStrategy.FromServer,
+    mergeStrategy: MergeStrategy.PreserveChanges,
+    includeDeleted: false
+});
 QueryOptions.prototype._$typeName = "QueryOptions";
 
 /**
@@ -4235,7 +4128,6 @@ function updateAliasMap(aliasMap, opStr, op) {
 @hidden @internal
 */
 class PassthruPredicate extends Predicate {
-    value;
     constructor(value) {
         super();
         this.value = value;
@@ -4247,7 +4139,6 @@ Error['x'] = PassthruPredicate.prototype._initialize('passthruPredicate');
 @hidden
 */
 class UnaryPredicate extends Predicate {
-    pred;
     constructor(op, ...args) {
         super();
         this.op = this._resolveOp(op);
@@ -4265,10 +4156,6 @@ Error['x'] = UnaryPredicate.prototype._initialize('unaryPredicate', {
 @hidden
 */
 class BinaryPredicate extends Predicate {
-    expr1Source;
-    expr2Source;
-    expr1;
-    expr2;
     constructor(op, expr1, expr2) {
         super();
         // 5 public props op, expr1Source, expr2Source, expr1, expr2
@@ -4337,7 +4224,6 @@ Error['x'] = BinaryPredicate.prototype._initialize('binaryPredicate', {
 @hidden
 */
 class AndOrPredicate extends Predicate {
-    preds;
     constructor(op, preds) {
         super();
         this.op = this._resolveOp(op);
@@ -4373,10 +4259,6 @@ Error['x'] = AndOrPredicate.prototype._initialize("andOrPredicate", {
 @hidden
 */
 class AnyAllPredicate extends Predicate {
-    /** @internal */
-    expr;
-    exprSource;
-    pred;
     // 4 public props: op, exprSource, expr, pred
     constructor(op, expr, pred) {
         super();
@@ -4400,9 +4282,6 @@ Error['x'] = AnyAllPredicate.prototype._initialize("anyAllPredicate", {
 });
 /** @hidden */
 class PredicateExpression {
-    visitorMethodName;
-    visit; // TODO
-    dataType;
     constructor(visitorMethodName) {
         this.visitorMethodName = visitorMethodName;
         // give expressions the Predicate prototype method
@@ -4418,8 +4297,6 @@ class PredicateExpression {
 @hidden
 */
 class LitExpr extends PredicateExpression {
-    value;
-    hasExplicitDataType;
     // 2 public props: value, dataType
     constructor(value, dataType, hasExplicitDataType) {
         super("litExpr");
@@ -4468,7 +4345,6 @@ function resolveDataType(dataType) {
 @hidden
 */
 class PropExpr extends PredicateExpression {
-    propertyPath;
     // two public props: propertyPath, dateType
     constructor(propertyPath) {
         super('propExpr');
@@ -4502,9 +4378,6 @@ class PropExpr extends PredicateExpression {
 @hidden @dynamic
 */
 class FnExpr extends PredicateExpression {
-    fnName;
-    exprs;
-    localFn; // TODO:
     constructor(fnName, exprs) {
         super('fnExpr');
         // 4 public props: fnName, exprs, localFn, dataType
@@ -4528,109 +4401,109 @@ class FnExpr extends PredicateExpression {
             expr._validate(entityType, usesNameOnServer);
         });
     }
-    static _funcMap = {
-        toupper: {
-            fn: function (source) {
-                return source.toUpperCase();
-            }, dataType: DataType.String
-        },
-        tolower: {
-            fn: function (source) {
-                return source.toLowerCase();
-            }, dataType: DataType.String
-        },
-        substring: {
-            fn: function (source, pos, length) {
-                return source.substring(pos, length);
-            }, dataType: DataType.String
-        },
-        substringof: {
-            fn: function (find, source) {
-                return source.indexOf(find) >= 0;
-            }, dataType: DataType.Boolean
-        },
-        length: {
-            fn: function (source) {
-                return source.length;
-            }, dataType: DataType.Int32
-        },
-        trim: {
-            fn: function (source) {
-                return source.trim();
-            }, dataType: DataType.String
-        },
-        concat: {
-            fn: function (s1, s2) {
-                return s1.concat(s2);
-            }, dataType: DataType.String
-        },
-        replace: {
-            fn: function (source, find, replace) {
-                return source.replace(find, replace);
-            }, dataType: DataType.String
-        },
-        startswith: {
-            fn: function (source, find) {
-                return core.stringStartsWith(source, find);
-            }, dataType: DataType.Boolean
-        },
-        endswith: {
-            fn: function (source, find) {
-                return core.stringEndsWith(source, find);
-            }, dataType: DataType.Boolean
-        },
-        indexof: {
-            fn: function (source, find) {
-                return source.indexOf(find);
-            }, dataType: DataType.Int32
-        },
-        round: {
-            fn: function (source) {
-                return Math.round(source);
-            }, dataType: DataType.Int32
-        },
-        ceiling: {
-            fn: function (source) {
-                return Math.ceil(source);
-            }, dataType: DataType.Int32
-        },
-        floor: {
-            fn: function (source) {
-                return Math.floor(source);
-            }, dataType: DataType.Int32
-        },
-        second: {
-            fn: function (source) {
-                return source.getSeconds();
-            }, dataType: DataType.Int32
-        },
-        minute: {
-            fn: function (source) {
-                return source.getMinutes();
-            }, dataType: DataType.Int32
-        },
-        hour: {
-            fn: function (source) {
-                return source.getHours();
-            }, dataType: DataType.Int32
-        },
-        day: {
-            fn: function (source) {
-                return source.getDate();
-            }, dataType: DataType.Int32
-        },
-        month: {
-            fn: function (source) {
-                return source.getMonth() + 1;
-            }, dataType: DataType.Int32
-        },
-        year: {
-            fn: function (source) {
-                return source.getFullYear();
-            }, dataType: DataType.Int32
-        }
-    };
 }
+FnExpr._funcMap = {
+    toupper: {
+        fn: function (source) {
+            return source.toUpperCase();
+        }, dataType: DataType.String
+    },
+    tolower: {
+        fn: function (source) {
+            return source.toLowerCase();
+        }, dataType: DataType.String
+    },
+    substring: {
+        fn: function (source, pos, length) {
+            return source.substring(pos, length);
+        }, dataType: DataType.String
+    },
+    substringof: {
+        fn: function (find, source) {
+            return source.indexOf(find) >= 0;
+        }, dataType: DataType.Boolean
+    },
+    length: {
+        fn: function (source) {
+            return source.length;
+        }, dataType: DataType.Int32
+    },
+    trim: {
+        fn: function (source) {
+            return source.trim();
+        }, dataType: DataType.String
+    },
+    concat: {
+        fn: function (s1, s2) {
+            return s1.concat(s2);
+        }, dataType: DataType.String
+    },
+    replace: {
+        fn: function (source, find, replace) {
+            return source.replace(find, replace);
+        }, dataType: DataType.String
+    },
+    startswith: {
+        fn: function (source, find) {
+            return core.stringStartsWith(source, find);
+        }, dataType: DataType.Boolean
+    },
+    endswith: {
+        fn: function (source, find) {
+            return core.stringEndsWith(source, find);
+        }, dataType: DataType.Boolean
+    },
+    indexof: {
+        fn: function (source, find) {
+            return source.indexOf(find);
+        }, dataType: DataType.Int32
+    },
+    round: {
+        fn: function (source) {
+            return Math.round(source);
+        }, dataType: DataType.Int32
+    },
+    ceiling: {
+        fn: function (source) {
+            return Math.ceil(source);
+        }, dataType: DataType.Int32
+    },
+    floor: {
+        fn: function (source) {
+            return Math.floor(source);
+        }, dataType: DataType.Int32
+    },
+    second: {
+        fn: function (source) {
+            return source.getSeconds();
+        }, dataType: DataType.Int32
+    },
+    minute: {
+        fn: function (source) {
+            return source.getMinutes();
+        }, dataType: DataType.Int32
+    },
+    hour: {
+        fn: function (source) {
+            return source.getHours();
+        }, dataType: DataType.Int32
+    },
+    day: {
+        fn: function (source) {
+            return source.getDate();
+        }, dataType: DataType.Int32
+    },
+    month: {
+        fn: function (source) {
+            return source.getMonth() + 1;
+        }, dataType: DataType.Int32
+    },
+    year: {
+        fn: function (source) {
+            return source.getFullYear();
+        }, dataType: DataType.Int32
+    }
+};
 // TODO: add dataTypes for the args next - will help to infer other dataTypes.
 let RX_IDENTIFIER = /^[a-z_][\w.$]*$/i;
 // comma delimited expressions ignoring commas inside of both single and double quotes.
@@ -4760,103 +4633,104 @@ function parseFnExpr(source, parts, tokens, exprContext) {
         throw e;
     }
 }
-// toFunctionVisitor
-let toFunctionVisitor = {
-    isExtended: false,
-    passthruPredicate: function () {
-        throw new Error("Cannot execute an PassthruPredicate expression against the local cache: " + this.value);
-    },
-    unaryPredicate: function (context) {
-        let predFn = this.pred.visit(context);
-        switch (this.op.key) {
-            case "not":
-                return function (entity) {
-                    return !predFn(entity);
-                };
-            default:
-                throw new Error("Invalid unary operator:" + this.op.key);
-        }
-    },
-    binaryPredicate: function (context) {
-        let expr1Fn = this.expr1.visit(context);
-        let expr2Fn = this.expr2.visit(context);
-        let dataType = this.expr1.dataType || this.expr2.dataType;
-        let lqco = context.entityType.metadataStore.localQueryComparisonOptions;
-        let predFn = getBinaryPredicateFn(this, dataType, lqco);
-        if (predFn == null) {
-            throw new Error("Invalid binaryPredicate operator:" + this.op.key);
-        }
-        return function (entity) {
-            return predFn(expr1Fn(entity), expr2Fn(entity));
-        };
-    },
-    andOrPredicate: function (context) {
-        let predFns = this.preds.map((pred) => {
-            return pred.visit(context);
-        });
-        switch (this.op.key) {
-            case "and":
-                return function (entity) {
-                    let result = predFns.reduce(function (prev, cur) {
-                        return prev && cur(entity);
-                    }, true);
-                    return result;
-                };
-            case "or":
-                return function (entity) {
-                    let result = predFns.reduce(function (prev, cur) {
-                        return prev || cur(entity);
-                    }, false);
-                    return result;
-                };
-            default:
-                throw new Error("Invalid boolean operator:" + this.op.key);
-        }
-    },
-    anyAllPredicate: function (context) {
-        let exprFn = this.expr.visit(context);
-        let newContext = core.extend({}, context);
-        newContext.entityType = this.expr.dataType;
-        let predFn = this.pred.visit(newContext);
-        let anyAllPredFn = getAnyAllPredicateFn(this.op);
-        return function (entity) {
-            return anyAllPredFn(exprFn(entity), predFn);
-        };
-    },
-    litExpr: function () {
-        let value = this.value;
-        return function (entity) {
-            return value;
-        };
-    },
-    propExpr: function () {
-        let propertyPath = this.propertyPath;
-        let properties = propertyPath.split('.');
-        if (properties.length === 1) {
+const ɵ0$2 = function () {
+    throw new Error("Cannot execute an PassthruPredicate expression against the local cache: " + this.value);
+}, ɵ1$1 = function (context) {
+    let predFn = this.pred.visit(context);
+    switch (this.op.key) {
+        case "not":
             return function (entity) {
-                return entity.getProperty(propertyPath);
+                return !predFn(entity);
             };
-        }
-        else {
+        default:
+            throw new Error("Invalid unary operator:" + this.op.key);
+    }
+}, ɵ2 = function (context) {
+    let expr1Fn = this.expr1.visit(context);
+    let expr2Fn = this.expr2.visit(context);
+    let dataType = this.expr1.dataType || this.expr2.dataType;
+    let lqco = context.entityType.metadataStore.localQueryComparisonOptions;
+    let predFn = getBinaryPredicateFn(this, dataType, lqco);
+    if (predFn == null) {
+        throw new Error("Invalid binaryPredicate operator:" + this.op.key);
+    }
+    return function (entity) {
+        return predFn(expr1Fn(entity), expr2Fn(entity));
+    };
+}, ɵ3 = function (context) {
+    let predFns = this.preds.map((pred) => {
+        return pred.visit(context);
+    });
+    switch (this.op.key) {
+        case "and":
             return function (entity) {
-                return EntityAspect.getPropertyPathValue(entity, properties);
+                let result = predFns.reduce(function (prev, cur) {
+                    return prev && cur(entity);
+                }, true);
+                return result;
             };
-        }
-    },
-    fnExpr: function (context) {
-        let exprFns = this.exprs.map(function (expr) {
-            return expr.visit(context);
-        });
-        let that = this;
+        case "or":
+            return function (entity) {
+                let result = predFns.reduce(function (prev, cur) {
+                    return prev || cur(entity);
+                }, false);
+                return result;
+            };
+        default:
+            throw new Error("Invalid boolean operator:" + this.op.key);
+    }
+}, ɵ4 = function (context) {
+    let exprFn = this.expr.visit(context);
+    let newContext = core.extend({}, context);
+    newContext.entityType = this.expr.dataType;
+    let predFn = this.pred.visit(newContext);
+    let anyAllPredFn = getAnyAllPredicateFn(this.op);
+    return function (entity) {
+        return anyAllPredFn(exprFn(entity), predFn);
+    };
+}, ɵ5 = function () {
+    let value = this.value;
+    return function (entity) {
+        return value;
+    };
+}, ɵ6 = function () {
+    let propertyPath = this.propertyPath;
+    let properties = propertyPath.split('.');
+    if (properties.length === 1) {
         return function (entity) {
-            let values = exprFns.map(function (exprFn) {
-                let value = exprFn(entity);
-                return value;
-            });
-            let result = that.localFn.apply(null, values);
-            return result;
+            return entity.getProperty(propertyPath);
+        };
+    }
+    else {
+        return function (entity) {
+            return EntityAspect.getPropertyPathValue(entity, properties);
         };
     }
+}, ɵ7 = function (context) {
+    let exprFns = this.exprs.map(function (expr) {
+        return expr.visit(context);
+    });
+    let that = this;
+    return function (entity) {
+        let values = exprFns.map(function (exprFn) {
+            let value = exprFn(entity);
+            return value;
+        });
+        let result = that.localFn.apply(null, values);
+        return result;
+    };
+};
+// toFunctionVisitor
+let toFunctionVisitor = {
+    isExtended: false,
+    passthruPredicate: ɵ0$2,
+    unaryPredicate: ɵ1$1,
+    binaryPredicate: ɵ2,
+    andOrPredicate: ɵ3,
+    anyAllPredicate: ɵ4,
+    litExpr: ɵ5,
+    propExpr: ɵ6,
+    fnExpr: ɵ7
 };
 function getAnyAllPredicateFn(op) {
     switch (op.key) {
@@ -4923,12 +4797,12 @@ function getBinaryPredicateFn(binaryPredicate, dataType, lqco) {
             break;
         case 'startswith':
             predFn = function (v1, v2) {
-                return stringStartsWith(v1, v2, lqco);
+                return stringStartsWith$1(v1, v2, lqco);
             };
             break;
         case 'endswith':
             predFn = function (v1, v2) {
-                return stringEndsWith(v1, v2, lqco);
+                return stringEndsWith$1(v1, v2, lqco);
             };
             break;
         case 'contains':
@@ -4964,14 +4838,14 @@ function stringEquals(a, b, lqco) {
     }
     return a === b;
 }
-function stringStartsWith(a, b, lqco) {
+function stringStartsWith$1(a, b, lqco) {
     if (!lqco.isCaseSensitive) {
         a = (a || "").toLowerCase();
         b = (b || "").toLowerCase();
     }
     return core.stringStartsWith(a, b);
 }
-function stringEndsWith(a, b, lqco) {
+function stringEndsWith$1(a, b, lqco) {
     if (!lqco.isCaseSensitive) {
         a = (a || "").toLowerCase();
         b = (b || "").toLowerCase();
@@ -4985,93 +4859,94 @@ function stringContains(a, b, lqco) {
     }
     return a.indexOf(b) >= 0;
 }
-// toJSONVisitor
-let toJSONVisitor = {
-    passthruPredicate: function () {
-        return this.value;
-    },
-    unaryPredicate: function (context) {
-        let predVal = this.pred.visit(context);
-        let json = {};
-        json[this.op.key] = predVal;
-        return json;
-    },
-    binaryPredicate: function (context) {
-        let expr1Val = this.expr1.visit(context);
-        let expr2Val = this.expr2.visit(context);
-        let json = {};
-        if (this.expr2 instanceof PropExpr) {
-            expr2Val = { value: expr2Val, isProperty: true };
-        }
-        if (this.op.key === "eq") {
-            json[expr1Val] = expr2Val;
-        }
-        else {
-            let value = {};
-            json[expr1Val] = value;
-            value[this.op.key] = expr2Val;
-        }
-        return json;
-    },
-    andOrPredicate: function (context) {
-        let predVals = this.preds.map(function (pred) {
-            return pred.visit(context);
-        });
-        if (!predVals || !predVals.length) {
-            return {};
-        }
-        let json;
-        // normalizeAnd clauses if possible.
-        // passthru predicate will appear as string and their 'ands' can't be 'normalized'
-        if (this.op.key === 'and' && predVals.length === 2 && !predVals.some((v) => v.or || typeof (v) === 'string')) {
-            // normalize 'and' clauses - will return null if can't be combined.
-            json = predVals.reduce(combine);
-        }
-        if (json == null) {
-            json = {};
-            json[this.op.key] = predVals;
-        }
-        return json;
-    },
-    anyAllPredicate: function (context) {
-        let exprVal = this.expr.visit(context);
-        let newContext = core.extend({}, context);
-        newContext.entityType = this.expr.dataType;
-        let predVal = this.pred.visit(newContext);
-        let json = {};
+const ɵ8 = function () {
+    return this.value;
+}, ɵ9 = function (context) {
+    let predVal = this.pred.visit(context);
+    let json = {};
+    json[this.op.key] = predVal;
+    return json;
+}, ɵ10 = function (context) {
+    let expr1Val = this.expr1.visit(context);
+    let expr2Val = this.expr2.visit(context);
+    let json = {};
+    if (this.expr2 instanceof PropExpr) {
+        expr2Val = { value: expr2Val, isProperty: true };
+    }
+    if (this.op.key === "eq") {
+        json[expr1Val] = expr2Val;
+    }
+    else {
         let value = {};
-        value[this.op.key] = predVal;
-        json[exprVal] = value;
-        return json;
-    },
-    litExpr: function (context) {
-        // special handling for DateOnly because it serializes improperly
-        const value = (this.dataType === DataType.DateOnly) ? DataType.toDateOnlyString(this.value) : this.value;
-        if (this.hasExplicitDataType || context.useExplicitDataType) {
-            return { value: value, dataType: this.dataType.name };
-        }
-        else {
-            return value;
-        }
-    },
-    propExpr: function (context) {
-        if (context.toNameOnServer) {
-            if (!context.entityType) {
-                console.warn(`No EntityType for propertyPath "${this.propertyPath}".  ${core.strings.TO_TYPE}`);
-                return this.propertyPath;
-            }
-            return context.entityType.clientPropertyPathToServer(this.propertyPath);
-        }
-        else {
+        json[expr1Val] = value;
+        value[this.op.key] = expr2Val;
+    }
+    return json;
+}, ɵ11 = function (context) {
+    let predVals = this.preds.map(function (pred) {
+        return pred.visit(context);
+    });
+    if (!predVals || !predVals.length) {
+        return {};
+    }
+    let json;
+    // normalizeAnd clauses if possible.
+    // passthru predicate will appear as string and their 'ands' can't be 'normalized'
+    if (this.op.key === 'and' && predVals.length === 2 && !predVals.some((v) => v.or || typeof (v) === 'string')) {
+        // normalize 'and' clauses - will return null if can't be combined.
+        json = predVals.reduce(combine);
+    }
+    if (json == null) {
+        json = {};
+        json[this.op.key] = predVals;
+    }
+    return json;
+}, ɵ12 = function (context) {
+    let exprVal = this.expr.visit(context);
+    let newContext = core.extend({}, context);
+    newContext.entityType = this.expr.dataType;
+    let predVal = this.pred.visit(newContext);
+    let json = {};
+    let value = {};
+    value[this.op.key] = predVal;
+    json[exprVal] = value;
+    return json;
+}, ɵ13 = function (context) {
+    // special handling for DateOnly because it serializes improperly
+    const value = (this.dataType === DataType.DateOnly) ? DataType.toDateOnlyString(this.value) : this.value;
+    if (this.hasExplicitDataType || context.useExplicitDataType) {
+        return { value: value, dataType: this.dataType.name };
+    }
+    else {
+        return value;
+    }
+}, ɵ14 = function (context) {
+    if (context.toNameOnServer) {
+        if (!context.entityType) {
+            console.warn(`No EntityType for propertyPath "${this.propertyPath}".  ${core.strings.TO_TYPE}`);
             return this.propertyPath;
         }
-    },
-    fnExpr: function (context) {
-        let exprVals = this.exprs.map(function (expr) {
-            return expr.visit(context);
-        });
-        return this.fnName + "(" + exprVals.join(",") + ")";
+        return context.entityType.clientPropertyPathToServer(this.propertyPath);
     }
+    else {
+        return this.propertyPath;
+    }
+}, ɵ15 = function (context) {
+    let exprVals = this.exprs.map(function (expr) {
+        return expr.visit(context);
+    });
+    return this.fnName + "(" + exprVals.join(",") + ")";
+};
+// toJSONVisitor
+let toJSONVisitor = {
+    passthruPredicate: ɵ8,
+    unaryPredicate: ɵ9,
+    binaryPredicate: ɵ10,
+    andOrPredicate: ɵ11,
+    anyAllPredicate: ɵ12,
+    litExpr: ɵ13,
+    propExpr: ɵ14,
+    fnExpr: ɵ15
 };
 function combine(j1, j2) {
     let ok = Object.keys(j2).every(function (key) {
@@ -5129,6 +5004,7 @@ class EntityQuery {
         this.parameters = {};
         this.inlineCountEnabled = false;
         this.noTrackingEnabled = false;
+        this.usePostEnabled = false;
         // default is to get queryOptions and dataService from the entityManager.
         // this.queryOptions = new QueryOptions();
         // this.dataService = new DataService();
@@ -5398,7 +5274,7 @@ class EntityQuery {
         return clone(this, "parameters", parameters);
     }
     /**
-    Returns a query with the 'inlineCount' capability either enabled or disabled.  With 'inlineCount' enabled, an additional 'inlineCount' property
+    Returns a query with the `inlineCount` capability either enabled or disabled.  With `inlineCount` enabled, an additional 'inlineCount' property
     will be returned with the query results that will contain the number of entities that would have been returned by this
     query with only the 'where'/'filter' clauses applied, i.e. without any 'skip'/'take' operators applied. For local queries this clause is ignored.
     >     let query = new EntityQuery("Customers")
@@ -5406,7 +5282,7 @@ class EntityQuery {
     >        .orderBy("CompanyName")
     >        .inlineCount(true);
   
-    will return the first 20 customers as well as a count of all of the customers in the remote store.
+    will return the first 20 customers as well as a count of _all_ of the customers in the remote store.
     @param enabled - (default = true) Whether or not inlineCount capability should be enabled. If this parameter is omitted, true is assumed.
     **/
     inlineCount(enabled) {
@@ -5420,7 +5296,7 @@ class EntityQuery {
         return clone(this, "usesNameOnServer", usesNameOnServer);
     }
     /**
-    Returns a query with the 'noTracking' capability either enabled or disabled.  With 'noTracking' enabled, the results of this query
+    Returns a query with the `noTracking` capability either enabled or disabled.  With `noTracking` enabled, the results of this query
     will not be coerced into entities but will instead look like raw javascript projections. i.e. simple javascript objects.
     >     let query = new EntityQuery("Customers")
     >         .take(20)
@@ -5434,6 +5310,22 @@ class EntityQuery {
         return clone(this, "noTrackingEnabled", enabled);
     }
     /**
+    Returns a query with the `usePost` capability either enabled or disabled.  With `usePost` enabled, the query is sent
+    as a POST request (instead of GET) and the query expression will be sent as JSON in the body of the post.
+    Note that the server must be able to parse the body of the request; otherwise the query expression will be ignored.
+    >     let query = new EntityQuery("Customers")
+    >         .where("companyId", "eq", 1)
+    >         .usePost(true);
+    results in a POST request to `{host}/{path}/Customers`
+    with body `{"where": {"companyId":{"eq":1}}}`
+    @param enabled - (default = true) Whether or not usePost should be enabled. If this parameter is omitted, true is assumed.
+    **/
+    usePost(enabled) {
+        assertParam(enabled, "enabled").isBoolean().isOptional().check();
+        enabled = (enabled === undefined) ? true : !!enabled;
+        return clone(this, "usePostEnabled", enabled);
+    }
+    /**
     Returns a copy of this EntityQuery with the specified [[EntityManager]], [[DataService]],
     [[JsonResultsAdapter]], [[MergeStrategy]] or [[FetchStrategy]] applied.
     >      // 'using' can be used to return a new query with a specified EntityManager.
@@ -5626,28 +5518,6 @@ class EntityQuery {
         q = q.where(pred).toType(entityKey.entityType);
         return q;
     }
-    /**
-    Creates an EntityQuery for the specified entity and [[NavigationProperty]].
-    >      // 'employee' is a previously queried employee
-    >      let ordersNavProp = employee.entityType.getProperty("Orders");
-    >      let query = EntityQuery.fromEntityNavigation(employee, ordersNavProp);
-  
-    will return a query for the "Orders" of the specified 'employee'.
-    @param entity - The Entity whose navigation property will be queried.
-    @param navigationProperty - The [[NavigationProperty]] or name of the NavigationProperty to be queried.
-    **/
-    static fromEntityNavigation = function (entity, navigationProperty) {
-        assertParam(entity, "entity").isEntity().check();
-        let navProperty = entity.entityType._checkNavProperty(navigationProperty);
-        let q = new EntityQuery(navProperty.entityType.defaultResourceName);
-        let pred = buildNavigationPredicate(entity, navProperty);
-        if (pred == null) {
-            throw new Error("Unable to create a NavigationQuery for navigationProperty: " + navProperty.name);
-        }
-        q = q.where(pred);
-        let em = entity.entityAspect.entityManager;
-        return em ? q.using(em) : q;
-    };
     // protected methods
     /** @hidden @internal */
     _getFromEntityType(metadataStore, throwErrorIfNotFound) {
@@ -5719,6 +5589,28 @@ class EntityQuery {
         return ds.uriBuilder.buildUri(this, em.metadataStore);
     }
 }
+/**
+Creates an EntityQuery for the specified entity and [[NavigationProperty]].
+>      // 'employee' is a previously queried employee
+>      let ordersNavProp = employee.entityType.getProperty("Orders");
+>      let query = EntityQuery.fromEntityNavigation(employee, ordersNavProp);
+
+will return a query for the "Orders" of the specified 'employee'.
+@param entity - The Entity whose navigation property will be queried.
+@param navigationProperty - The [[NavigationProperty]] or name of the NavigationProperty to be queried.
+**/
+EntityQuery.fromEntityNavigation = function (entity, navigationProperty) {
+    assertParam(entity, "entity").isEntity().check();
+    let navProperty = entity.entityType._checkNavProperty(navigationProperty);
+    let q = new EntityQuery(navProperty.entityType.defaultResourceName);
+    let pred = buildNavigationPredicate(entity, navProperty);
+    if (pred == null) {
+        throw new Error("Unable to create a NavigationQuery for navigationProperty: " + navProperty.name);
+    }
+    q = q.where(pred);
+    let em = entity.entityAspect.entityManager;
+    return em ? q.using(em) : q;
+};
 EntityQuery.prototype._$typeName = "EntityQuery";
 // private functions
 function fromJSON(eq, json) {
@@ -5745,6 +5637,7 @@ function fromJSON(eq, json) {
         },
         "inlineCountEnabled,inlineCount": false,
         "noTrackingEnabled,noTracking": false,
+        "usePostEnabled,usePost": false,
         queryOptions: function (v) {
             return v ? QueryOptions.fromJSON(v) : undefined;
         }
@@ -5769,6 +5662,7 @@ function clone(eq, propName, value) {
         "expandClause",
         "inlineCountEnabled",
         "noTrackingEnabled",
+        "usePostEnabled",
         "usesNameOnServer",
         "queryOptions",
         "entityManager",
@@ -5858,33 +5752,33 @@ FilterQueryOp is an 'Enum' containing all of the valid  [[Predicate]]
 filter operators for an [[EntityQuery]].
 **/
 class FilterQueryOp extends BreezeEnum {
-    /** Aliases: "eq", "==" **/
-    static Equals = new FilterQueryOp({ operator: "eq" });
-    /**  Aliases: "ne", "!="  **/
-    static NotEquals = new FilterQueryOp({ operator: "ne" });
-    /** Aliases: "gt", ">"   **/
-    static GreaterThan = new FilterQueryOp({ operator: "gt" });
-    /** Aliases: "lt", "<"  **/
-    static LessThan = new FilterQueryOp({ operator: "lt" });
-    /**  Aliases: "ge", ">="  **/
-    static GreaterThanOrEqual = new FilterQueryOp({ operator: "ge" });
-    /**  Aliases: "le", "<="  **/
-    static LessThanOrEqual = new FilterQueryOp({ operator: "le" });
-    /**  String operation: Is a string a substring of another string.  Aliases: "substringof"   **/
-    static Contains = new FilterQueryOp({ operator: "contains" });
-    /** No aliases */
-    static StartsWith = new FilterQueryOp({ operator: "startswith" });
-    /** No aliases */
-    static EndsWith = new FilterQueryOp({ operator: "endswith" });
-    /**  Aliases: "some"  **/
-    static Any = new FilterQueryOp({ operator: "any" });
-    /**  Aliases: "every"  **/
-    static All = new FilterQueryOp({ operator: "all" });
-    /** No aliases */
-    static In = new FilterQueryOp({ operator: "in" });
-    /** No aliases */
-    static IsTypeOf = new FilterQueryOp({ operator: "isof" });
 }
+/** Aliases: "eq", "==" **/
+FilterQueryOp.Equals = new FilterQueryOp({ operator: "eq" });
+/**  Aliases: "ne", "!="  **/
+FilterQueryOp.NotEquals = new FilterQueryOp({ operator: "ne" });
+/** Aliases: "gt", ">"   **/
+FilterQueryOp.GreaterThan = new FilterQueryOp({ operator: "gt" });
+/** Aliases: "lt", "<"  **/
+FilterQueryOp.LessThan = new FilterQueryOp({ operator: "lt" });
+/**  Aliases: "ge", ">="  **/
+FilterQueryOp.GreaterThanOrEqual = new FilterQueryOp({ operator: "ge" });
+/**  Aliases: "le", "<="  **/
+FilterQueryOp.LessThanOrEqual = new FilterQueryOp({ operator: "le" });
+/**  String operation: Is a string a substring of another string.  Aliases: "substringof"   **/
+FilterQueryOp.Contains = new FilterQueryOp({ operator: "contains" });
+/** No aliases */
+FilterQueryOp.StartsWith = new FilterQueryOp({ operator: "startswith" });
+/** No aliases */
+FilterQueryOp.EndsWith = new FilterQueryOp({ operator: "endswith" });
+/**  Aliases: "some"  **/
+FilterQueryOp.Any = new FilterQueryOp({ operator: "any" });
+/**  Aliases: "every"  **/
+FilterQueryOp.All = new FilterQueryOp({ operator: "all" });
+/** No aliases */
+FilterQueryOp.In = new FilterQueryOp({ operator: "in" });
+/** No aliases */
+FilterQueryOp.IsTypeOf = new FilterQueryOp({ operator: "isof" });
 FilterQueryOp.prototype._$typeName = "FilterQueryOp";
 Error['x'] = FilterQueryOp.resolveSymbols();
 /**
@@ -5892,10 +5786,10 @@ Error['x'] = FilterQueryOp.resolveSymbols();
 operators for an [[EntityQuery]].
 **/
 class BooleanQueryOp extends BreezeEnum {
-    static And = new BooleanQueryOp({ operator: "and" });
-    static Or = new BooleanQueryOp({ operator: "or" });
-    static Not = new BooleanQueryOp({ operator: "not" });
 }
+BooleanQueryOp.And = new BooleanQueryOp({ operator: "and" });
+BooleanQueryOp.Or = new BooleanQueryOp({ operator: "or" });
+BooleanQueryOp.Not = new BooleanQueryOp({ operator: "not" });
 BooleanQueryOp.prototype._$typeName = "BooleanQueryOp";
 Error['x'] = BooleanQueryOp.resolveSymbols();
 /** For use by breeze plugin authors only.  The class is used in most [[IUriBuilderAdapter]] implementations
@@ -5916,8 +5810,6 @@ or
 >     let obc = new OrderByClause("Company.CompanyName, LastName", true);
 */
 class OrderByClause {
-    /** @hidden @internal */
-    items;
     constructor(propertyPaths, isDesc) {
         if (propertyPaths.length === 0) {
             throw new Error("OrderByClause cannot be empty");
@@ -5964,9 +5856,6 @@ class OrderByClause {
 }
 /** @hidden @internal */
 class OrderByItem {
-    propertyPath;
-    isDesc;
-    lastProperty;
     constructor(propertyPath, isDesc) {
         if (!(typeof propertyPath === 'string')) {
             throw new Error("propertyPath is not a string");
@@ -6042,9 +5931,6 @@ class OrderByItem {
 @hidden
 **/
 class SelectClause {
-    propertyPaths;
-    /** @hidden @internal */
-    _pathNames;
     constructor(propertyPaths) {
         this.propertyPaths = propertyPaths;
         this._pathNames = propertyPaths.map(function (pp) {
@@ -6080,7 +5966,6 @@ class SelectClause {
 @hidden
 **/
 class ExpandClause {
-    propertyPaths;
     constructor(propertyPaths) {
         this.propertyPaths = propertyPaths;
     }
@@ -6106,96 +5991,53 @@ a query, import or [[EntityManager.createEntity]] call.
 
 **/
 class EntityAspect {
-    /** The Entity that this aspect is associated with. __Read Only__  **/
-    entity;
-    /** The [[EntityManager]] that contains this entity. __Read Only__ **/
-    entityManager;
-    /**  @hidden @internal */
-    entityGroup;
-    /** The [[EntityState]] of this entity. __Read Only__ **/
-    entityState;
-    /**   Whether this entity is in the process of being saved. __Read Only__ */
-    isBeingSaved;
-    /** The 'original values' of this entity where they are different from the 'current values'.
-    This is a map where the key is a property name and the value is the 'original value' of the property. */
-    originalValues;
-    /**  Whether this entity has any validation errors. __Read Only__ */
-    hasValidationErrors;
-    /** Whether this entity has a temporary [[EntityKey]]. */
-    hasTempKey;
-    /** Whether this entity was created by being loaded from the database */
-    wasLoaded;
-    /** Extra metadata about this entity such as the entity's etag.
-    You may extend this object with your own metadata information.
-    Breeze (de)serializes this object when importing/exporting the entity. **/
-    extraMetadata;
-    /**
-    A [[BreezeEvent]] that fires whenever any of the validation errors on this entity change.
-    Note that this might be the removal of an error when some data on the entity is fixed.
-    @eventArgs -
-      - entity - The entity on which the validation errors are being added or removed.
-      - added - An array containing any newly added [[ValidationError]]s
-      - removed - An array containing any newly removed [[ValidationError]]s. This is those
-        errors that have been 'fixed'.
-  
-  >      // assume order is an order entity attached to an EntityManager.
-  >      order.entityAspect.validationErrorsChanged.subscribe(
-  >      function (validationChangeArgs) {
-  >          // this code will be executed anytime a property value changes on the 'order' entity.
-  >          var entity == validationChangeArgs.entity; // Note: entity === order
-  >          var errorsAdded = validationChangeArgs.added;
-  >          var errorsCleared = validationChangeArgs.removed;
-  >      });
-    @event
-    **/
-    validationErrorsChanged;
-    /**
-    A [[BreezeEvent]] that fires whenever a value of one of this entity's properties change.
-    @eventArgs -
-      - entity - The entity whose property has changed.
-      - property - The [[DataProperty]] that changed.
-      - propertyName - The name of the property that changed. This value will be 'null' for operations that replace the entire entity.  This includes
-        queries, imports and saves that require a merge. The remaining parameters will not exist in this case either. This will actually be a "property path"
-        for any properties of a complex type.
-      - oldValue - The old value of this property before the change.
-      - newValue - The new value of this property after the change.
-      - parent - The immediate parent object for the changed property.  This will be a ComplexType instance as opposed to an Entity
-        for any complex type or nested complex type properties.
-  
-    >      // assume order is an order entity attached to an EntityManager.
-    >      order.entityAspect.propertyChanged.subscribe(
-    >      function (propertyChangedArgs) {
-    >          // this code will be executed anytime a property value changes on the 'order' entity.
-    >          var entity = propertyChangedArgs.entity; // Note: entity === order
-    >          var propertyNameChanged = propertyChangedArgs.propertyName;
-    >          var oldValue = propertyChangedArgs.oldValue;
-    >          var newValue = propertyChangedArgs.newValue;
-    >      });
-    @event
-    **/
-    propertyChanged;
-    /** @hidden @internal */
-    _validationErrors;
-    /** @hidden @internal */
-    _pendingValidationResult;
-    /** @hidden @internal */
-    _entityKey;
-    /** @hidden @internal */
-    _loadedNps;
-    /** @hidden @internal */
-    _initialized;
-    /** @hidden @internal */
-    _inProcess; // used in defaultPropertyInterceptor for temp storage.
-    /** @hidden @internal */
-    _inProcessEntity; // used in EntityManager
-    /** @hidden @internal */
-    static _nullInstance = new EntityAspect(); // TODO: determine if this works
     /** @hidden @internal */
     constructor(entity) {
         // if called without new
         // if (!(this instanceof EntityAspect)) {
         //   return new EntityAspect(entity);
         // }
+        /**
+        Sets the entity to an EntityState of 'Unchanged'.  This is also the equivalent of calling [[EntityAspect.acceptChanges]].
+        The same operation can be performed by calling [[EntityAspect.setEntityState]].
+        >      // assume order is an order entity attached to an EntityManager.
+        >      order.entityAspect.setUnchanged();
+        >      // The 'order' entity will now be in an 'Unchanged' state with any changes committed.
+        **/
+        this.setUnchanged = function () {
+            return this.setEntityState(EntityState.Unchanged);
+        };
+        /**
+        Sets the entity to an EntityState of 'Modified'.  This can also be achieved by changing the value of any property on an 'Unchanged' entity.
+        The same operation can be performed by calling [[EntityAspect.setEntityState]].
+        >      // assume order is an order entity attached to an EntityManager.
+        >      order.entityAspect.setModified();
+        >      // The 'order' entity will now be in a 'Modified' state.
+        **/
+        this.setModified = function () {
+            return this.setEntityState(EntityState.Modified);
+        };
+        /**
+        Sets the entity to an EntityState of 'Deleted'.  This both marks the entity as being scheduled for deletion during the next 'Save' call
+        but also removes the entity from all of its related entities.  If the current entityState is 'Added', then `setDeleted()` will mark it 'Detached'
+        The same operation can be performed by calling [[EntityAspect.setEntityState]].
+        >      // assume order is an order entity attached to an EntityManager.
+        >      order.entityAspect.setDeleted();
+        >      // The 'order' entity will now be in a 'Deleted' state and it will no longer have any 'related' entities.
+        **/
+        this.setDeleted = function () {
+            return this.setEntityState(EntityState.Deleted);
+        };
+        /**
+        Sets the entity to an EntityState of 'Detached'.  This removes the entity from all of its related entities, but does NOT change the EntityState of any existing entities.
+        The same operation can be performed by calling [[EntityAspect.setEntityState]].
+        >      // assume order is an order entity attached to an EntityManager.
+        >      order.entityAspect.setDetached();
+        >      // The 'order' entity will now be in a 'Detached' state and it will no longer have any 'related' entities.
+        **/
+        this.setDetached = function () {
+            return this.setEntityState(EntityState.Detached);
+        };
         this.entity = entity;
         // TODO: keep public or not?
         this.entityGroup = undefined;
@@ -6356,47 +6198,6 @@ class EntityAspect {
         return this.setEntityState(EntityState.Added);
     }
     /**
-    Sets the entity to an EntityState of 'Unchanged'.  This is also the equivalent of calling [[EntityAspect.acceptChanges]].
-    The same operation can be performed by calling [[EntityAspect.setEntityState]].
-    >      // assume order is an order entity attached to an EntityManager.
-    >      order.entityAspect.setUnchanged();
-    >      // The 'order' entity will now be in an 'Unchanged' state with any changes committed.
-    **/
-    setUnchanged = function () {
-        return this.setEntityState(EntityState.Unchanged);
-    };
-    /**
-    Sets the entity to an EntityState of 'Modified'.  This can also be achieved by changing the value of any property on an 'Unchanged' entity.
-    The same operation can be performed by calling [[EntityAspect.setEntityState]].
-    >      // assume order is an order entity attached to an EntityManager.
-    >      order.entityAspect.setModified();
-    >      // The 'order' entity will now be in a 'Modified' state.
-    **/
-    setModified = function () {
-        return this.setEntityState(EntityState.Modified);
-    };
-    /**
-    Sets the entity to an EntityState of 'Deleted'.  This both marks the entity as being scheduled for deletion during the next 'Save' call
-    but also removes the entity from all of its related entities.  If the current entityState is 'Added', then `setDeleted()` will mark it 'Detached'
-    The same operation can be performed by calling [[EntityAspect.setEntityState]].
-    >      // assume order is an order entity attached to an EntityManager.
-    >      order.entityAspect.setDeleted();
-    >      // The 'order' entity will now be in a 'Deleted' state and it will no longer have any 'related' entities.
-    **/
-    setDeleted = function () {
-        return this.setEntityState(EntityState.Deleted);
-    };
-    /**
-    Sets the entity to an EntityState of 'Detached'.  This removes the entity from all of its related entities, but does NOT change the EntityState of any existing entities.
-    The same operation can be performed by calling [[EntityAspect.setEntityState]].
-    >      // assume order is an order entity attached to an EntityManager.
-    >      order.entityAspect.setDetached();
-    >      // The 'order' entity will now be in a 'Detached' state and it will no longer have any 'related' entities.
-    **/
-    setDetached = function () {
-        return this.setEntityState(EntityState.Detached);
-    };
-    /**
     Sets the entity to the specified EntityState. See also 'setUnchanged', 'setModified', 'setDetached', etc.
     >      // assume order is an order entity attached to an EntityManager.
     >      order.entityAspect.setEntityState(EntityState.Unchanged);
@@ -6413,12 +6214,12 @@ class EntityAspect {
         let em = this.entityManager;
         let needsSave = true;
         if (entityState === EntityState.Unchanged) {
-            clearOriginalValues$1(entity);
+            clearOriginalValues(entity);
             delete this.hasTempKey;
             needsSave = false;
         }
         else if (entityState === EntityState.Added) {
-            clearOriginalValues$1(entity);
+            clearOriginalValues(entity);
             // TODO: more to do here... like regenerating key ???
         }
         else if (entityState === EntityState.Deleted) {
@@ -6759,6 +6560,8 @@ class EntityAspect {
         }
     }
 }
+/** @hidden @internal */
+EntityAspect._nullInstance = new EntityAspect(); // TODO: determine if this works
 BreezeEvent.bubbleEvent(EntityAspect.prototype, function () {
     return this.entityManager;
 });
@@ -6892,17 +6695,6 @@ entity via either a query, import or EntityManager.createEntity call.
 >      // aCustomer === aspect.parent;
 **/
 class ComplexAspect {
-    /** The complex object that this aspect is associated with. __Read Only__ */
-    complexObject;
-    /** The 'original values' of this complex object where they are different from the 'current values'.
-    This is a map where the key is a property name and the value is the 'original value' of the property.
-    __Read Only__ */
-    originalValues;
-    /** The parent object that to which this aspect belongs; this will either be an entity or another complex object. __Read Only__ */
-    parent;
-    /** The [[DataProperty]] on the 'parent' that contains this complex object. __Read Only__ */
-    parentProperty;
-    extraMetadata;
     /** You will rarely, if ever, create a ComplexAspect directly. */
     constructor(complexObject, parent, parentProperty) {
         if (!complexObject) {
@@ -6962,18 +6754,18 @@ class ComplexAspect {
         return aspect.getPropertyPath(this.parentProperty.name + "." + propName);
     }
 }
-function clearOriginalValues$1(target) {
+function clearOriginalValues(target) {
     let aspect = target.entityAspect || target.complexAspect;
     aspect.originalValues = {};
     let stype = target.entityType || target.complexType;
     stype.complexProperties.forEach(function (cp) {
         let cos = target.getProperty(cp.name);
         if (cp.isScalar) {
-            clearOriginalValues$1(cos);
+            clearOriginalValues(cos);
         }
         else {
             cos._acceptChanges();
-            cos.forEach(clearOriginalValues$1);
+            cos.forEach(clearOriginalValues);
         }
     });
 }
@@ -6986,14 +6778,6 @@ The default NamingConvention does not perform any translation, it simply passes
 @dynamic
 **/
 class NamingConvention {
-    /** @hidden @internal */
-    _$typeName;
-    /** The name of this NamingConvention. __Read Only__ */
-    name;
-    /** Function that takes a server property name add converts it into a client side property name.  __Read Only__ */
-    serverPropertyNameToClient;
-    /** Function that takes a client property name add converts it into a server side property name. __Read Only__ */
-    clientPropertyNameToServer;
     /**
     NamingConvention constructor
     >      // A naming convention that converts the first character of every property name to uppercase on the server
@@ -7021,38 +6805,6 @@ class NamingConvention {
         config._storeObject(this, "NamingConvention", this.name);
     }
     /**
-  
-  
-    /**
-    A noop naming convention - This is the default unless another is specified.
-    **/
-    static none = new NamingConvention({
-        name: "noChange",
-        serverPropertyNameToClient: (serverPropertyName) => {
-            return serverPropertyName;
-        },
-        clientPropertyNameToServer: (clientPropertyName) => {
-            return clientPropertyName;
-        }
-    });
-    /**
-    The "camelCase" naming convention - This implementation only lowercases the first character of the server property name
-    but leaves the rest of the property name intact.  If a more complicated version is needed then one should be created via the ctor.
-    **/
-    static camelCase = new NamingConvention({
-        name: "camelCase",
-        serverPropertyNameToClient: (serverPropertyName) => {
-            return serverPropertyName.substr(0, 1).toLowerCase() + serverPropertyName.substr(1);
-        },
-        clientPropertyNameToServer: (clientPropertyName) => {
-            return clientPropertyName.substr(0, 1).toUpperCase() + clientPropertyName.substr(1);
-        }
-    });
-    /**
-    The default value whenever NamingConventions are not specified.
-    **/
-    static defaultInstance = new NamingConvention(NamingConvention.none);
-    /**
     Sets the 'defaultInstance' by creating a copy of the current 'defaultInstance' and then applying all of the properties of the current instance.
     The current instance is returned unchanged.
     >      var namingConv = new NamingConvention({
@@ -7068,7 +6820,39 @@ class NamingConvention {
     setAsDefault() {
         return core.setAsDefault(this, NamingConvention);
     }
-}
+}
+/**
+
+
+/**
+A noop naming convention - This is the default unless another is specified.
+**/
+NamingConvention.none = new NamingConvention({
+    name: "noChange",
+    serverPropertyNameToClient: (serverPropertyName) => {
+        return serverPropertyName;
+    },
+    clientPropertyNameToServer: (clientPropertyName) => {
+        return clientPropertyName;
+    }
+});
+/**
+The "camelCase" naming convention - This implementation only lowercases the first character of the server property name
+but leaves the rest of the property name intact.  If a more complicated version is needed then one should be created via the ctor.
+**/
+NamingConvention.camelCase = new NamingConvention({
+    name: "camelCase",
+    serverPropertyNameToClient: (serverPropertyName) => {
+        return serverPropertyName.substr(0, 1).toLowerCase() + serverPropertyName.substr(1);
+    },
+    clientPropertyNameToServer: (clientPropertyName) => {
+        return clientPropertyName.substr(0, 1).toUpperCase() + clientPropertyName.substr(1);
+    }
+});
+/**
+The default value whenever NamingConventions are not specified.
+**/
+NamingConvention.defaultInstance = new NamingConvention(NamingConvention.none);
 NamingConvention.prototype._$typeName = "NamingConvention";
 
 const RX_COLLECTION = /Collection\((.*)\)/;
@@ -7461,16 +7245,6 @@ The default LocalQueryComparisonOptions stipulates 'caseInsensitive" queries wit
 length strings.
 **/
 class LocalQueryComparisonOptions {
-    /** @hidden @internal */
-    _$typeName; // on prototype
-    /** The name for this instance. */
-    name;
-    /** Whether predicates that involve strings will be interpreted in a "caseSensitive" manner. (default = false).  */
-    isCaseSensitive;
-    /* Whether or not to enforce the ANSI SQL standard
-    of padding strings of unequal lengths before comparison with spaces. Note that per the standard, padding only occurs with equality and
-    inequality predicates, and not with operations like 'startsWith', 'endsWith' or 'contains'.  Default is true. */
-    usesSql92CompliantStringComparison;
     /**
     LocalQueryComparisonOptions constructor
     >      // create a 'caseSensitive - non SQL' instance.
@@ -7498,18 +7272,6 @@ class LocalQueryComparisonOptions {
         config._storeObject(this, "LocalQueryComparisonOptions", this.name);
     }
     /**
-    Case insensitive SQL compliant options - this is also the default unless otherwise changed.
-    **/
-    static caseInsensitiveSQL = new LocalQueryComparisonOptions({
-        name: "caseInsensitiveSQL",
-        isCaseSensitive: false,
-        usesSql92CompliantStringComparison: true
-    });
-    /**
-    The default value whenever LocalQueryComparisonOptions are not specified. By default this is 'caseInsensitiveSQL'.
-    **/
-    static defaultInstance = new LocalQueryComparisonOptions(LocalQueryComparisonOptions.caseInsensitiveSQL);
-    /**
     Sets the 'defaultInstance' by creating a copy of the current 'defaultInstance' and then applying all of the properties of the current instance.
     The current instance is returned unchanged.
     >     var lqco = new LocalQueryComparisonOptions({
@@ -7522,6 +7284,18 @@ class LocalQueryComparisonOptions {
         return core.setAsDefault(this, LocalQueryComparisonOptions);
     }
 }
+/**
+Case insensitive SQL compliant options - this is also the default unless otherwise changed.
+**/
+LocalQueryComparisonOptions.caseInsensitiveSQL = new LocalQueryComparisonOptions({
+    name: "caseInsensitiveSQL",
+    isCaseSensitive: false,
+    usesSql92CompliantStringComparison: true
+});
+/**
+The default value whenever LocalQueryComparisonOptions are not specified. By default this is 'caseInsensitiveSQL'.
+**/
+LocalQueryComparisonOptions.defaultInstance = new LocalQueryComparisonOptions(LocalQueryComparisonOptions.caseInsensitiveSQL);
 LocalQueryComparisonOptions.prototype._$typeName = "LocalQueryComparisonOptions";
 
 /** @hidden @internal */
@@ -7985,52 +7759,6 @@ explicit MetadataStore, the MetadataStore from the MetadataStore.defaultInstance
 @dynamic
 **/
 class MetadataStore {
-    /** @hidden @internal */
-    static __id = 0;
-    /** @hidden @internal */
-    static ANONTYPE_PREFIX = "_IB_";
-    /** The version of any MetadataStores created by this class */
-    static metadataVersion = '1.0.5';
-    name;
-    dataServices;
-    /** The  [[NamingConvention]] associated with this MetadataStore. __Read Only__ */
-    namingConvention;
-    /** The  [[LocalQueryComparisonOptions]] associated with this MetadataStore. __Read Only__ */
-    localQueryComparisonOptions;
-    serializerFn;
-    /**
-    An [[BreezeEvent]] that fires after a MetadataStore has completed fetching metadata from a remote service.
-    
-    @eventArgs -
-      - metadataStore - The MetadataStore into which the metadata was fetched.
-      - dataService - The [[DataService]] that metadata was fetched from.
-      - rawMetadata - {Object} The raw metadata returned from the service. (It will have already been processed by this point).
-    >      let ms = myEntityManager.metadataStore;
-    >      ms.metadataFetched.subscribe(function(args) {
-    >          let metadataStore = args.metadataStore;
-    >          let dataService = args.dataService;
-    >      });
-    @event
-    **/
-    metadataFetched;
-    /** @hidden @internal */
-    _resourceEntityTypeMap;
-    /** @hidden @internal */
-    _entityTypeResourceMap;
-    /** @hidden @internal key is qualified structuraltype name - value is structuralType. ( structural = entityType or complexType). */
-    _structuralTypeMap;
-    /** @hidden @internal key is shortName, value is qualified name - does not need to be serialized. **/
-    _shortNameMap;
-    /** @hidden @internal key is either short or qual type name - value is ctor; **/
-    _ctorRegistry;
-    /** @hidden @internal key is entityTypeName; value is array of nav props **/
-    _incompleteTypeMap;
-    /** @hidden @internal **/
-    _incompleteComplexTypeMap;
-    /** @hidden @internal { json: any, stype: StructuralType }[] | { entityType: EntityType, csdlEntityType: any }[] **/
-    _deferredTypes;
-    /** @hidden @internal **/
-    _id;
     /**
     Constructs a new MetadataStore.
     
@@ -8070,10 +7798,6 @@ class MetadataStore {
         this._id = MetadataStore.__id++;
         this.metadataFetched = new BreezeEvent("metadataFetched", this);
     }
-    // needs to be made avail to dataService.xxx files
-    static normalizeTypeName = core.memoize(function (rawTypeName) {
-        return rawTypeName && MetadataStore.parseTypeName(rawTypeName).typeName;
-    });
     // for debugging use the line below instead.
     //ctor.normalizeTypeName = function (rawTypeName) { return parseTypeName(rawTypeName).typeName; };
     /**
@@ -8604,6 +8328,16 @@ class MetadataStore {
         }
     }
 }
+/** @hidden @internal */
+MetadataStore.__id = 0;
+/** @hidden @internal */
+MetadataStore.ANONTYPE_PREFIX = "_IB_";
+/** The version of any MetadataStores created by this class */
+MetadataStore.metadataVersion = '1.0.5';
+// needs to be made avail to dataService.xxx files
+MetadataStore.normalizeTypeName = core.memoize(function (rawTypeName) {
+    return rawTypeName && MetadataStore.parseTypeName(rawTypeName).typeName;
+});
 MetadataStore.prototype._$typeName = "MetadataStore";
 BreezeEvent.bubbleEvent(MetadataStore.prototype);
 function getTypesFromMap(typeMap) {
@@ -8722,76 +8456,6 @@ function getQualifiedTypeName(metadataStore, structTypeName, throwIfNotFound) {
 /** Container for all of the metadata about a specific type of Entity.
 **/
 class EntityType {
-    /** @hidden @internal */
-    static __nextAnonIx = 0;
-    /** Always false for an EntityType. **/
-    isComplexType = false;
-    /** The [[MetadataStore]] that contains this EntityType. __Read Only__ **/
-    metadataStore;
-    /** The DataProperties (see [[DataProperty]] associated with this EntityType. __Read Only__  **/
-    dataProperties;
-    /**  The NavigationProperties (see [[NavigationProperty]] associated with this EntityType. __Read Only__  **/
-    navigationProperties;
-    /**
-    The DataProperties associated with this EntityType that make up it's [[EntityKey]]. __Read Only__ **/
-    keyProperties;
-    /** The DataProperties associated with this EntityType that are foreign key properties. __Read Only__ **/
-    foreignKeyProperties;
-    inverseForeignKeyProperties;
-    /**  The DataProperties associated with this EntityType that are concurrency properties. __Read Only__ **/
-    concurrencyProperties;
-    /** The DataProperties for this EntityType that contain instances of a [[ComplexType]]. __Read Only__   **/
-    complexProperties;
-    /** The DataProperties associated with this EntityType that are not mapped to any backend datastore. These are effectively free standing
-    properties. __Read Only__ **/
-    unmappedProperties;
-    /** The fully qualified name of this EntityType. __Read Only__  **/
-    name;
-    /** The short, unqualified, name for this EntityType. __Read Only__  **/
-    shortName;
-    /** The namespace for this EntityType. __Read Only__  **/
-    namespace;
-    /** The name of this EntityType's base EntityType  (if any) */
-    baseTypeName;
-    /** The base EntityType (if any) for this EntityType. __Read Only__   **/
-    baseEntityType;
-    subtypes;
-    /**  Whether this EntityType is abstract. __Read Only__ **/
-    isAbstract;
-    /**  Whether this EntityType is anonymous. Anonymous types will never be communicated to or from the server. They are purely for
-    client side use and are given an automatically generated name.  __Read Only__ **/
-    isAnonymous;
-    /** Whether this EntityType has been 'frozen'.  EntityTypes become frozen after the first instance
-    of that type has been created and attached to an EntityManager. */
-    isFrozen;
-    /** The [[AutoGeneratedKeyType]] for this EntityType. __Read Only__ **/
-    autoGeneratedKeyType;
-    /**   The default resource name associated with this EntityType.  An EntityType may be queried via a variety of 'resource names' but this one
-    is used as the default when no resource name is provided.  This will occur when calling [[EntityAspect.loadNavigationProperty]]
-    or when executing any [[EntityQuery]] that was created via an [[EntityKey]]. __Read Only__ **/
-    defaultResourceName;
-    /** A function that is used to customize the serialization of any EntityProperties of this type. */
-    serializerFn;
-    /**  A free form object that can be used to define any custom metadata for this EntityType. __Read Only__  **/
-    custom;
-    /** The entity level validators associated with this EntityType. Validators can be added and
-    removed from this collection. __Read Only__.   **/
-    validators;
-    warnings;
-    initFn;
-    noTrackingFn;
-    /** @hidden @internal */
-    _extra;
-    /** @hidden @internal */
-    _ctor;
-    /** @hidden @internal */
-    _mappedPropertiesCount;
-    /**
-    @deprecated Use [[getCtor]] instead.
-    */
-    getEntityCtor = this.getCtor;
-    /** @hidden @internal */
-    static qualifyTypeName = qualifyTypeName;
     /** EntityType constructor
     >      let entityType = new EntityType( {
     >          shortName: "person",
@@ -8802,6 +8466,12 @@ class EntityType {
     client side use and will be given an automatically generated name. Normally, however, you will use a configuration object.
     **/
     constructor(config) {
+        /** Always false for an EntityType. **/
+        this.isComplexType = false;
+        /**
+        @deprecated Use [[getCtor]] instead.
+        */
+        this.getEntityCtor = this.getCtor;
         if (arguments.length > 1) {
             throw new Error("The EntityType ctor has a single argument that is either a 'MetadataStore' or a configuration object.");
         }
@@ -9453,6 +9123,10 @@ class EntityType {
         delete incompleteTypeMap[this.name];
     }
 }
+/** @hidden @internal */
+EntityType.__nextAnonIx = 0;
+/** @hidden @internal */
+EntityType.qualifyTypeName = qualifyTypeName;
 EntityType.prototype._$typeName = "EntityType";
 function getRawValueFromConfig(rawEntity, dp) {
     // 'true' fork can happen if an initializer contains an actaul instance of an already created complex object.
@@ -9591,66 +9265,33 @@ function calcUnmappedProperties(stype, instance) {
 @param config - Configuration settings
 **/
 class ComplexType {
-    /** For polymorphic purpose only - always true here */
-    isComplexType = true;
-    /** The [[MetadataStore]] containing this ComplexType. */
-    metadataStore;
-    /**  The fully qualifed name of this ComplexType. __Read Only__  **/
-    name;
-    /**  The short, unqualified, name for this ComplexType. __Read Only__ **/
-    shortName;
-    /** The namespace for this ComplexType. __Read Only__ **/
-    namespace;
-    /** The DataProperties (see [[DataProperty]] associated with this ComplexType. __Read Only__ */
-    dataProperties;
-    /** The DataProperties for this ComplexType that contain instances of a [[ComplexType]]. __Read Only__ */
-    complexProperties;
-    /**
-    The entity level validators associated with this ComplexType. Validators can be added and
-    removed from this collection. __Read Only__  **/
-    validators;
-    /** For polymorphic purpose only - always empty here */
-    concurrencyProperties;
-    /** The DataProperties associated with this ComplexType that are not mapped to any backend datastore. These are effectively free standing
-    properties. __Read Only__   **/
-    unmappedProperties;
-    // keyProperties and navigationProperties are not used on complexTypes - but here to allow sharing of code between EntityType and ComplexType.
-    navigationProperties;
-    // and may be used later to enforce uniqueness on arrays of complextypes.
-    keyProperties;
-    warnings;
-    serializerFn;
-    /** A free form object that can be used to define any custom metadata for this ComplexType. ***/
-    custom;
-    /** @hidden @internal */
-    _mappedPropertiesCount;
-    /** @hidden @internal */
-    _extra;
-    // copy entityType methods onto complexType
-    /** See [[EntityType.getCtor]] */
-    getCtor = EntityType.prototype.getCtor;
-    // note the name change.
-    createInstance = EntityType.prototype.createEntity;
-    /** See [EntityType.addValidator] */
-    addValidator = EntityType.prototype.addValidator;
-    getProperty = EntityType.prototype.getProperty;
-    getPropertiesOnPath = EntityType.prototype.getPropertiesOnPath;
-    getPropertyNames = EntityType.prototype.getPropertyNames;
-    /** @hidden @internal */
-    _addPropertyCore = EntityType.prototype._addPropertyCore;
-    /** @hidden @internal */
-    _addDataProperty = EntityType.prototype._addDataProperty;
-    /** @hidden @internal */
-    _updateNames = EntityType.prototype._updateNames;
-    /** @hidden @internal */
-    _updateCps = EntityType.prototype._updateCps;
-    /** @hidden @internal */
-    _initializeInstance = EntityType.prototype._initializeInstance;
-    /** @hidden @internal */
-    _updateTargetFromRaw = EntityType.prototype._updateTargetFromRaw;
-    /** @hidden @internal */
-    _setCtor = EntityType.prototype._setCtor;
     constructor(config) {
+        /** For polymorphic purpose only - always true here */
+        this.isComplexType = true;
+        // copy entityType methods onto complexType
+        /** See [[EntityType.getCtor]] */
+        this.getCtor = EntityType.prototype.getCtor;
+        // note the name change.
+        this.createInstance = EntityType.prototype.createEntity;
+        /** See [EntityType.addValidator] */
+        this.addValidator = EntityType.prototype.addValidator;
+        this.getProperty = EntityType.prototype.getProperty;
+        this.getPropertiesOnPath = EntityType.prototype.getPropertiesOnPath;
+        this.getPropertyNames = EntityType.prototype.getPropertyNames;
+        /** @hidden @internal */
+        this._addPropertyCore = EntityType.prototype._addPropertyCore;
+        /** @hidden @internal */
+        this._addDataProperty = EntityType.prototype._addDataProperty;
+        /** @hidden @internal */
+        this._updateNames = EntityType.prototype._updateNames;
+        /** @hidden @internal */
+        this._updateCps = EntityType.prototype._updateCps;
+        /** @hidden @internal */
+        this._initializeInstance = EntityType.prototype._initializeInstance;
+        /** @hidden @internal */
+        this._updateTargetFromRaw = EntityType.prototype._updateTargetFromRaw;
+        /** @hidden @internal */
+        this._setCtor = EntityType.prototype._setCtor;
         if (arguments.length > 1) {
             throw new Error("The ComplexType ctor has a single argument that is a configuration object.");
         }
@@ -9731,10 +9372,6 @@ Instances of the DataProperty class are constructed automatically during Metadat
 directly via the constructor.
 **/
 class DataProperty {
-    /** Is this a DataProperty? - always true here. Allows polymorphic treatment of DataProperties and NavigationProperties. __Read Only__ */
-    isDataProperty = true;
-    /** Is this a NavigationProperty? - always false here.  Allows polymorphic treatment of DataProperties and NavigationProperties. __Read Only__ */
-    isNavigationProperty = false;
     /** DataProperty constructor
     >      let lastNameProp = new DataProperty( {
     >          name: "lastName",
@@ -9747,6 +9384,10 @@ class DataProperty {
     @param config - A configuration Object or a DataProperty
     */
     constructor(config) {
+        /** Is this a DataProperty? - always true here. Allows polymorphic treatment of DataProperties and NavigationProperties. __Read Only__ */
+        this.isDataProperty = true;
+        /** Is this a NavigationProperty? - always false here.  Allows polymorphic treatment of DataProperties and NavigationProperties. __Read Only__ */
+        this.isNavigationProperty = false;
         assertConfig(config)
             .whereParam("name").isString().isOptional()
             .whereParam("nameOnServer").isString().isOptional()
@@ -9910,15 +9551,6 @@ Instances of the NavigationProperty class are constructed automatically during M
 directly via the constructor.
 **/
 class NavigationProperty {
-    /** Is this a DataProperty? - always false here
-    Allows polymorphic treatment of DataProperties and NavigationProperties. __Read Only__ */
-    isDataProperty = false;
-    /** Is this a NavigationProperty? - always true here
-    Allows polymorphic treatment of DataProperties and NavigationProperties. __Read Only__ */
-    isNavigationProperty = true;
-    formatName = DataProperty.prototype.formatName;
-    getAllValidators = DataProperty.prototype.getAllValidators;
-    resolveProperty = DataProperty.prototype.resolveProperty;
     /** NavigationProperty constructor
     >      let homeAddressProp = new NavigationProperty( {
     >          name: "homeAddress",
@@ -9937,6 +9569,15 @@ class NavigationProperty {
     @param config - A configuration object.
     **/
     constructor(config) {
+        /** Is this a DataProperty? - always false here
+        Allows polymorphic treatment of DataProperties and NavigationProperties. __Read Only__ */
+        this.isDataProperty = false;
+        /** Is this a NavigationProperty? - always true here
+        Allows polymorphic treatment of DataProperties and NavigationProperties. __Read Only__ */
+        this.isNavigationProperty = true;
+        this.formatName = DataProperty.prototype.formatName;
+        this.getAllValidators = DataProperty.prototype.getAllValidators;
+        this.resolveProperty = DataProperty.prototype.resolveProperty;
         assertConfig(config)
             .whereParam("name").isString().isOptional()
             .whereParam("nameOnServer").isString().isOptional()
@@ -10128,24 +9769,24 @@ function resolveRelated(np) {
 AutoGeneratedKeyType is an 'Enum' containing all of the valid states for an automatically generated key.
 **/
 class AutoGeneratedKeyType extends BreezeEnum {
-    /**
-    This entity does not have an autogenerated key.
-    The client must set the key before adding the entity to the EntityManager
-    **/
-    static None = new AutoGeneratedKeyType();
-    /**
-    This entity's key is an Identity column and is set by the backend database.
-    Keys for new entities will be temporary until the entities are saved at which point the keys will
-    be converted to their 'real' versions.
-    **/
-    static Identity = new AutoGeneratedKeyType();
-    /**
-    This entity's key is generated by a KeyGenerator and is set by the backend database.
-    Keys for new entities will be temporary until the entities are saved at which point the keys will
-    be converted to their 'real' versions.
-    **/
-    static KeyGenerator = new AutoGeneratedKeyType();
 }
+/**
+This entity does not have an autogenerated key.
+The client must set the key before adding the entity to the EntityManager
+**/
+AutoGeneratedKeyType.None = new AutoGeneratedKeyType();
+/**
+This entity's key is an Identity column and is set by the backend database.
+Keys for new entities will be temporary until the entities are saved at which point the keys will
+be converted to their 'real' versions.
+**/
+AutoGeneratedKeyType.Identity = new AutoGeneratedKeyType();
+/**
+This entity's key is generated by a KeyGenerator and is set by the backend database.
+Keys for new entities will be temporary until the entities are saved at which point the keys will
+be converted to their 'real' versions.
+**/
+AutoGeneratedKeyType.KeyGenerator = new AutoGeneratedKeyType();
 AutoGeneratedKeyType.prototype._$typeName = "AutoGeneratedKeyType";
 Error['x'] = AutoGeneratedKeyType.resolveSymbols();
 let proto = Param.prototype;
@@ -10211,6 +9852,41 @@ function addProperties(entityType, propObj, ctor) {
 @hidden
 */
 class AbstractDataServiceAdapter {
+    constructor() {
+        /**
+        Returns a constructor function for a "ChangeRequestInterceptor"
+        that can tweak the saveBundle both as it is built and when it is completed
+        by a concrete DataServiceAdapater.
+      
+        Initialized with a default, no-op implementation that developers can replace with a
+        substantive implementation that changes the individual entity change requests
+        or aspects of the entire 'saveBundle' without having to write their own DataService adapters.
+        >     let adapter = breeze.config.getAdapterInstance('dataService');
+        >     adapter.changeRequestInterceptor = function (saveContext, saveBundle) {
+        >         this.getRequest = function (request, entity, index) {
+        >            // alter the request that the adapter prepared for this entity
+        >            // based on the entity, saveContext, and saveBundle
+        >            // e.g., add a custom header or prune the originalValuesMap
+        >            return request;
+        >        };
+        >        this.done = function (requests) {
+        >            // alter the array of requests representing the entire change-set
+        >            // based on the saveContext and saveBundle
+        >        };
+        >     }
+      
+        @param saveContext - The BreezeJS "context" for the save operation.
+        @param saveBundle - Contains the array of entities-to-be-saved (AKA, the entity change-set).
+        @return Constructor for a "ChangeRequestInterceptor".
+        **/
+        this.changeRequestInterceptor = DefaultChangeRequestInterceptor;
+        this.jsonResultsAdapter = new JsonResultsAdapter({
+            name: "noop",
+            visitNode: function ( /* node, mappingContext, nodeContext */) {
+                return {};
+            }
+        });
+    }
     // TODO use interface
     checkForRecomposition(interfaceInitializedArgs) {
         if (interfaceInitializedArgs.interfaceName === "ajax" && interfaceInitializedArgs.isDefault) {
@@ -10261,51 +9937,82 @@ class AbstractDataServiceAdapter {
         });
         return promise;
     }
+    /** Execute the query in the mappingContext using the ajaxImpl. */
     executeQuery(mappingContext) {
         mappingContext.adapter = this;
+        const usePost = mappingContext.query.usePostEnabled;
+        const params = usePost ? this._makeQueryPostParams(mappingContext) : this._makeQueryGetParams(mappingContext);
         let promise = new Promise((resolve, reject) => {
-            let url = mappingContext.getUrl();
-            let params = {
-                type: "GET",
-                url: url,
-                params: mappingContext.query.parameters,
-                dataType: 'json',
-                success: function (httpResponse) {
-                    let data = httpResponse.data;
-                    try {
-                        let rData;
-                        let results = data && (data.results || data.Results);
-                        if (results) {
-                            rData = { results: results, inlineCount: data.inlineCount || data.InlineCount,
-                                httpResponse: httpResponse, query: mappingContext.query };
-                        }
-                        else {
-                            rData = { results: data, httpResponse: httpResponse, query: mappingContext.query };
-                        }
-                        resolve(rData);
+            params.success = function (httpResponse) {
+                let data = httpResponse.data;
+                try {
+                    let rData;
+                    let results = data && (data.results || data.Results);
+                    if (results) {
+                        rData = { results: results, inlineCount: data.inlineCount || data.InlineCount,
+                            httpResponse: httpResponse, query: mappingContext.query };
                     }
-                    catch (e) {
-                        if (e instanceof Error) {
-                            reject(e);
-                        }
-                        else {
-                            handleHttpError(reject, httpResponse);
-                        }
+                    else {
+                        rData = { results: data, httpResponse: httpResponse, query: mappingContext.query };
                     }
-                },
-                error: function (httpResponse) {
-                    handleHttpError(reject, httpResponse);
-                },
-                crossDomain: false
+                    resolve(rData);
+                }
+                catch (e) {
+                    if (e instanceof Error) {
+                        reject(e);
+                    }
+                    else {
+                        handleHttpError(reject, httpResponse);
+                    }
+                }
+            };
+            params.error = function (httpResponse) {
+                handleHttpError(reject, httpResponse);
             };
-            if (mappingContext.dataService.useJsonp) {
-                params.dataType = 'jsonp';
-                params.crossDomain = true;
-            }
             this.ajaxImpl.ajax(params);
         });
         return promise;
     }
+    /** Set up ajax parameters for query GET.  This puts the query into the request querystring in either JSON or OData-style syntax, depending upon the UriBuilder. */
+    _makeQueryGetParams(mappingContext) {
+        const url = mappingContext.getUrl();
+        const params = {
+            type: "GET",
+            url: url,
+            params: mappingContext.query.parameters,
+            dataType: 'json',
+            crossDomain: false,
+        };
+        if (mappingContext.dataService.useJsonp) {
+            params.dataType = 'jsonp';
+            params.crossDomain = true;
+        }
+        return params;
+    }
+    /** Set up ajax parameters for query POST.  This put the query into the request body as JSON. */
+    _makeQueryPostParams(mappingContext) {
+        const entityQuery = mappingContext.query;
+        const metadataStore = mappingContext.entityManager.metadataStore;
+        const url = mappingContext.dataService.qualifyUrl(entityQuery.resourceName);
+        let entityType = entityQuery._getFromEntityType(metadataStore, false);
+        if (!entityType) {
+            entityType = new EntityType(metadataStore);
+        }
+        const json = entityQuery.toJSONExt({ entityType: entityType, toNameOnServer: true });
+        json.from = undefined;
+        json.queryOptions = undefined;
+        const params = {
+            type: "POST",
+            url: url,
+            params: mappingContext.query.parameters,
+            dataType: 'json',
+            processData: false,
+            contentType: "application/json; charset=UTF-8",
+            data: JSON.stringify(json),
+            crossDomain: false,
+        };
+        return params;
+    }
     saveChanges(saveContext, saveBundle) {
         let adapter = saveContext.adapter = this;
         let saveBundleSer = adapter._prepareSaveBundle(saveContext, saveBundle);
@@ -10345,33 +10052,6 @@ class AbstractDataServiceAdapter {
         // The implementor should call _createChangeRequestInterceptor
         throw new Error("Need a concrete implementation of _prepareSaveBundle");
     }
-    /**
-    Returns a constructor function for a "ChangeRequestInterceptor"
-    that can tweak the saveBundle both as it is built and when it is completed
-    by a concrete DataServiceAdapater.
-  
-    Initialized with a default, no-op implementation that developers can replace with a
-    substantive implementation that changes the individual entity change requests
-    or aspects of the entire 'saveBundle' without having to write their own DataService adapters.
-    >     let adapter = breeze.config.getAdapterInstance('dataService');
-    >     adapter.changeRequestInterceptor = function (saveContext, saveBundle) {
-    >         this.getRequest = function (request, entity, index) {
-    >            // alter the request that the adapter prepared for this entity
-    >            // based on the entity, saveContext, and saveBundle
-    >            // e.g., add a custom header or prune the originalValuesMap
-    >            return request;
-    >        };
-    >        this.done = function (requests) {
-    >            // alter the array of requests representing the entire change-set
-    >            // based on the saveContext and saveBundle
-    >        };
-    >     }
-  
-    @param saveContext - The BreezeJS "context" for the save operation.
-    @param saveBundle - Contains the array of entities-to-be-saved (AKA, the entity change-set).
-    @return Constructor for a "ChangeRequestInterceptor".
-    **/
-    changeRequestInterceptor = DefaultChangeRequestInterceptor;
     /** @hidden @internal */
     _createChangeRequestInterceptor(saveContext, saveBundle) {
         let adapter = saveContext.adapter;
@@ -10409,12 +10089,6 @@ class AbstractDataServiceAdapter {
                 "Likely did not or could not reach server. Is the server running?";
         }
     }
-    jsonResultsAdapter = new JsonResultsAdapter({
-        name: "noop",
-        visitNode: function ( /* node, mappingContext, nodeContext */) {
-            return {};
-        }
-    });
 }
 function handleHttpError(reject, httpResponse, messagePrefix) {
     let err = createError(httpResponse);
@@ -10501,20 +10175,6 @@ A ValidationOptions instance is used to specify the conditions under which valid
 
 */
 class ValidationOptions {
-    /** @hidden @internal */
-    _$typeName; // on proto
-    /** Whether entity and property level validation should occur when entities are attached to the EntityManager
-    other than via a query. (default = true) __Read Only__ */
-    validateOnAttach;
-    /** Whether entity and property level validation should occur before entities are saved.
-    A failed validation will force the save to fail early. (default = true) __Read Only__ */
-    validateOnSave;
-    /** Whether entity and property level validation should occur after entities are queried from a remote server.
-    (default = false) __Read Only__  **/
-    validateOnQuery;
-    /** Whether property level validation should occur after entities are modified.
-    (default = true) __Read Only__ **/
-    validateOnPropertyChange;
     /**
     ValidationOptions constructor
     >     var newVo = new ValidationOptions( { validateOnSave: false, validateOnAttach: false });
@@ -10523,7 +10183,7 @@ class ValidationOptions {
     @param config - A configuration object.
     **/
     constructor(config) {
-        updateWithConfig(this, config);
+        updateWithConfig$1(this, config);
     }
     /**
     Returns a copy of this ValidationOptions with changes to the specified config properties.
@@ -10536,7 +10196,7 @@ class ValidationOptions {
         if (!config)
             return this;
         let result = new ValidationOptions(this);
-        updateWithConfig(result, config);
+        updateWithConfig$1(result, config);
         return result;
     }
     /**
@@ -10549,18 +10209,18 @@ class ValidationOptions {
     setAsDefault() {
         return core.setAsDefault(this, ValidationOptions);
     }
-    /**
-    The default instance for use whenever ValidationOptions are not specified.
-    **/
-    static defaultInstance = new ValidationOptions({
-        validateOnAttach: true,
-        validateOnSave: true,
-        validateOnQuery: false,
-        validateOnPropertyChange: true
-    });
 }
+/**
+The default instance for use whenever ValidationOptions are not specified.
+**/
+ValidationOptions.defaultInstance = new ValidationOptions({
+    validateOnAttach: true,
+    validateOnSave: true,
+    validateOnQuery: false,
+    validateOnPropertyChange: true
+});
 ValidationOptions.prototype._$typeName = "ValidationOptions";
-function updateWithConfig(options, config) {
+function updateWithConfig$1(options, config) {
     if (config) {
         assertConfig(config)
             .whereParam("validateOnAttach").isBoolean().isOptional()
@@ -10576,18 +10236,6 @@ function updateWithConfig(options, config) {
 A SaveOptions instance is used to specify the 'options' under which a save will occur.
 **/
 class SaveOptions {
-    /** @hidden @internal */
-    _$typeName; // on proto
-    /** Resource name to be used during the save - this defaults to "SaveChanges". __Read Only__ */
-    resourceName;
-    /** The DataService to be used for this save. __Read Only__ */
-    dataService;
-    /** Whether multiple saves can be in-flight at the same time. The default is false. __Read Only__ */
-    allowConcurrentSaves;
-    /** Free form value that will be sent to the server during the save. __Read Only__ */
-    tag;
-    /** The default value whenever SaveOptions are not specified. */
-    static defaultInstance = new SaveOptions({ allowConcurrentSaves: false });
     constructor(config) {
         SaveOptions._updateWithConfig(this, config);
     }
@@ -10618,14 +10266,14 @@ class SaveOptions {
         return obj;
     }
 }
+/** The default value whenever SaveOptions are not specified. */
+SaveOptions.defaultInstance = new SaveOptions({ allowConcurrentSaves: false });
 SaveOptions.prototype._$typeName = "SaveOptions";
 
 /*
   @class KeyGenerator
   */
 class KeyGenerator {
-    /** @hidden @internal */
-    _tempIdMap;
     constructor() {
         // key is dataProperty.name + || + entityType.name, value is propEntry
         // propEntry = { entityType, propertyName, keyMap }
@@ -10730,11 +10378,6 @@ config.registerType(KeyGenerator, "KeyGenerator");
 
 /** @hidden @internal */
 class EntityGroup {
-    entityManager;
-    entityType;
-    _indexMap;
-    _entities;
-    _emptyIndexes;
     constructor(entityManager, entityType) {
         this.entityManager = entityManager;
         this.entityType = entityType;
@@ -10922,19 +10565,8 @@ For use by breeze plugin authors only. The class is for use in building a [[IDat
 @hidden
 */
 class MappingContext {
-    /** @hidden @internal */
-    _$typeName; // on prototype
-    rawValueFn = DataProperty.getRawValueFromServer; // think about passing this in later.
-    dataService;
-    query;
-    entityManager;
-    mergeOptions;
-    adapter; // assigned in the AbstractDataServiceAdapter.
-    refMap; // TODO
-    deferredFns; // TODO
-    jsonResultsAdapter;
-    metadataStore;
     constructor(config) {
+        this.rawValueFn = DataProperty.getRawValueFromServer; // think about passing this in later.
         core.extend(this, config, [
             "query", "entityManager", "dataService", "mergeOptions"
         ]);
@@ -11157,7 +10789,7 @@ function mergeEntity(mc, node, meta) {
                     targetEntity.entityAspect.extraMetadata = meta.extraMetadata;
                 }
                 targetEntity.entityAspect.entityState = EntityState.Unchanged;
-                clearOriginalValues(targetEntity);
+                clearOriginalValues$1(targetEntity);
                 // propertyName not specified because multiple props EntityChangedEventArgs
                 targetEntity.entityAspect.propertyChanged.publish({ entity: targetEntity, propertyName: null });
                 let action = isSaving ? EntityAction.MergeOnSave : EntityAction.MergeOnQuery;
@@ -11191,18 +10823,18 @@ function mergeEntity(mc, node, meta) {
     return targetEntity;
 }
 // copied from entityAspect
-function clearOriginalValues(target) {
+function clearOriginalValues$1(target) {
     let aspect = target.entityAspect || target.complexAspect;
     aspect.originalValues = {};
     let stype = target.entityType || target.complexType;
     stype.complexProperties.forEach(function (cp) {
         let cos = target.getProperty(cp.name);
         if (cp.isScalar) {
-            clearOriginalValues(cos);
+            clearOriginalValues$1(cos);
         }
         else {
             cos._acceptChanges();
-            cos.forEach(clearOriginalValues);
+            cos.forEach(clearOriginalValues$1);
         }
     });
 }
@@ -11334,8 +10966,10 @@ function updateRelatedEntityInCollection(mc, relatedEntity, relatedEntities, tar
 /** @hidden @internal */
 // Represents entities not yet attached to navigationProperties. 
 class UnattachedChildrenMap {
-    // key is EntityKey.toString(), value is array of { navigationProperty, children }
-    map = {};
+    constructor() {
+        // key is EntityKey.toString(), value is array of { navigationProperty, children }
+        this.map = {};
+    }
     addChild(parentEntityKey, navigationProperty, child) {
         let tuple = this.getTuple(parentEntityKey, navigationProperty);
         if (!tuple) {
@@ -11390,100 +11024,6 @@ class UnattachedChildrenMap {
 Instances of the EntityManager contain and manage collections of entities, either retrieved from a backend datastore or created on the client.
 **/
 class EntityManager {
-    /** @hidden @internal */
-    _$typeName; // actually defined on prototype
-    /** The service name associated with this EntityManager. __Read Only__ **/
-    serviceName;
-    /** The DataService associated with this EntityManager. __Read Only__ **/
-    dataService;
-    /** The [[QueryOptions]] associated with this EntityManager. __Read Only__ **/
-    queryOptions;
-    /** The [[SaveOptions]] associated with this EntityManager. __Read Only__ **/
-    saveOptions;
-    /** The [[ValidationOptions]] associated with this EntityManager. __Read Only__ **/
-    validationOptions;
-    /** The [[KeyGenerator]] associated with this EntityManager. __Read Only__ **/
-    keyGenerator;
-    /** The [[KeyGenerator]] constructor associated with this EntityManager. __Read Only__ **/
-    keyGeneratorCtor; // TODO: review this
-    /** The [[MetadataStore]] associated with this EntityManager. __Read Only__ **/
-    metadataStore;
-    isLoading;
-    isRejectingChanges;
-    // events
-    /**
-    A [[BreezeEvent]] that fires whenever a change to any entity in this EntityManager occurs. __Read Only__
-  
-    @eventArgs -
-    - entityAction - The [[EntityAction]] that occured.
-    - entity - The entity that changed.  If this is null, then all entities in the entityManager were affected.
-    - args - Additional information about this event. This will differ based on the entityAction.
-  
-    >      let em = new EntityManager( {serviceName: "breeze/NorthwindIBModel" });
-    >      em.entityChanged.subscribe(function(changeArgs) {
-    >          // This code will be executed any time any entity within the entityManager
-    >          // is added, modified, deleted or detached for any reason.
-    >          let action = changeArgs.entityAction;
-    >          let entity = changeArgs.entity;
-    >          // .. do something to this entity when it is changed.
-    >      });
-    >  });
-    @event
-    **/
-    entityChanged;
-    /**
-    An [[BreezeEvent]] that fires whenever validationErrors change for any entity in this EntityManager. __Read Only__
-    @eventArgs -
-      - entity - The entity on which the validation errors have been added or removed.
-      - added - An array containing any newly added [[ValidationError]]s
-      - removed - An array containing any newly removed [[ValidationError]]s. This is those errors that have been 'fixed'
-  
-    >      let em = new EntityManager( {serviceName: "breeze/NorthwindIBModel" });
-    >      em.validationErrorsChanged.subscribe(function(changeArgs) {
-    >              // This code will be executed any time any entity within the entityManager experiences a change to its validationErrors collection.
-    >              function (validationChangeArgs) {
-    >                  let entity == validationChangeArgs.entity;
-    >                  let errorsAdded = validationChangeArgs.added;
-    >                  let errorsCleared = validationChangeArgs.removed;
-    >                  // ... do something interesting with the order.
-    >              });
-    >          });
-    >      });
-    @event
-    **/
-    validationErrorsChanged;
-    /**
-    A [[BreezeEvent]] that fires whenever an EntityManager transitions to or from having changes. __Read Only__
-    @eventArgs -
-      - entityManager - The EntityManager whose 'hasChanges' status has changed.
-      - hasChanges - Whether or not this EntityManager has changes.
-  
-    >      let em = new EntityManager( {serviceName: "breeze/NorthwindIBModel" });
-    >      em.hasChangesChanged.subscribe(function(args) {
-    >              let hasChangesChanged = args.hasChanges;
-    >              let entityManager = args.entityManager;
-    >          });
-    >      });
-    @event
-    **/
-    hasChangesChanged;
-    /** @hidden @internal */
-    _pendingPubs; // TODO: refine later
-    /** @hidden @internal */
-    _hasChangesAction; // TODO refine later
-    /** @hidden @internal */
-    _hasChanges;
-    /** @hidden @internal */
-    _entityGroupMap;
-    /** @hidden @internal */
-    _unattachedChildrenMap;
-    /** @hidden @internal */
-    _inKeyFixup;
-    helper = {
-        unwrapInstance: unwrapInstance,
-        unwrapOriginalValues: unwrapOriginalValues,
-        unwrapChangedValues: unwrapChangedValues
-    };
     /**
     EntityManager constructor.
   
@@ -11522,6 +11062,11 @@ class EntityManager {
     @param emConfig - Configuration settings or a service name.
     **/
     constructor(emConfig) {
+        this.helper = {
+            unwrapInstance: unwrapInstance,
+            unwrapOriginalValues: unwrapOriginalValues,
+            unwrapChangedValues: unwrapChangedValues
+        };
         if (arguments.length > 1) {
             throw new Error("The EntityManager ctor has a single optional argument that is either a 'serviceName' or a configuration object.");
         }
@@ -13551,10 +13096,12 @@ function getSerializerFn(stype) {
 
 /** Registers adapters used by Breeze */
 class InterfaceRegistry {
-    ajax = new InterfaceDef("ajax");
-    modelLibrary = new InterfaceDef("modelLibrary");
-    dataService = new InterfaceDef("dataService");
-    uriBuilder = new InterfaceDef("uriBuilder");
+    constructor() {
+        this.ajax = new InterfaceDef("ajax");
+        this.modelLibrary = new InterfaceDef("modelLibrary");
+        this.dataService = new InterfaceDef("dataService");
+        this.uriBuilder = new InterfaceDef("uriBuilder");
+    }
 }
 config.interfaceRegistry = new InterfaceRegistry();
 config._interfaceRegistry = config.interfaceRegistry;
@@ -13585,118 +13132,119 @@ config.initializeAdapterInstances = function (irConfig) {
     return core.objectMap(config, this.initializeAdapterInstance);
 };
 
-let mixin = {
-    push: function (...args) {
-        if (this._inProgress) {
-            return -1;
-        }
-        let goodAdds = this._getGoodAdds(args);
-        if (!goodAdds.length) {
-            return this.length;
-        }
-        this._beforeChange();
-        let result;
-        let objPrototype = Object.getPrototypeOf(this);
-        if (objPrototype.push) {
-            result = objPrototype.push.apply(this, goodAdds);
-        }
-        else {
-            result = Array.prototype.push.apply(this, goodAdds);
-        }
-        processAdds$2(this, goodAdds);
-        return result;
-    },
-    _push: function (...args) {
-        if (this._inProgress) {
-            return -1;
-        }
-        let goodAdds = args;
-        this._beforeChange();
-        let result;
-        let objPrototype = Object.getPrototypeOf(this);
-        if (objPrototype.push) {
-            result = objPrototype.push.apply(this, goodAdds);
-        }
-        else {
-            result = Array.prototype.push.apply(this, goodAdds);
-        }
-        processAdds$2(this, goodAdds);
-        return result;
-    },
-    unshift: function (...args) {
-        let goodAdds = this._getGoodAdds(args);
-        if (!goodAdds.length) {
-            return this.length;
-        }
-        this._beforeChange();
-        let result;
-        let objPrototype = Object.getPrototypeOf(this);
-        if (objPrototype.unshift) {
-            result = objPrototype.unshift.apply(this, goodAdds);
-        }
-        else {
-            result = Array.prototype.unshift.apply(this, goodAdds);
-        }
-        processAdds$2(this, goodAdds);
-        return result;
-    },
-    pop: function () {
-        this._beforeChange();
-        let result;
-        let objPrototype = Object.getPrototypeOf(this);
-        if (objPrototype.pop) {
-            result = objPrototype.pop.apply(this);
-        }
-        else {
-            result = Array.prototype.pop.apply(this);
-        }
-        processRemoves$2(this, [result]);
-        return result;
-    },
-    shift: function () {
-        this._beforeChange();
-        let result;
-        let objPrototype = Object.getPrototypeOf(this);
-        if (objPrototype.shift) {
-            result = objPrototype.shift.apply(this);
-        }
-        else {
-            result = Array.prototype.shift.apply(this);
-        }
-        processRemoves$2(this, [result]);
-        return result;
-    },
-    splice: function (...args) {
-        let goodAdds = this._getGoodAdds(core.arraySlice(args, 2));
-        let newArgs = core.arraySlice(args, 0, 2).concat(goodAdds);
-        this._beforeChange();
-        let result;
-        let objPrototype = Object.getPrototypeOf(this);
-        if (objPrototype.splice) {
-            result = objPrototype.splice.apply(this, newArgs);
-        }
-        else {
-            result = Array.prototype.splice.apply(this, newArgs);
-        }
-        processRemoves$2(this, result);
-        if (goodAdds.length) {
-            processAdds$2(this, goodAdds);
-        }
-        return result;
-    },
-    getEntityAspect: function () {
-        return this.parent.entityAspect || this.parent.complexAspect.getEntityAspect();
-    },
-    _getEventParent: function () {
-        return this.getEntityAspect();
-    },
-    _getPendingPubs: function () {
-        let em = this.getEntityAspect().entityManager;
-        return em && em._pendingPubs;
-    },
-    _beforeChange: function () {
-        // default is to do nothing
+const ɵ0$3 = function (...args) {
+    if (this._inProgress) {
+        return -1;
+    }
+    let goodAdds = this._getGoodAdds(args);
+    if (!goodAdds.length) {
+        return this.length;
+    }
+    this._beforeChange();
+    let result;
+    let objPrototype = Object.getPrototypeOf(this);
+    if (objPrototype.push) {
+        result = objPrototype.push.apply(this, goodAdds);
+    }
+    else {
+        result = Array.prototype.push.apply(this, goodAdds);
+    }
+    processAdds(this, goodAdds);
+    return result;
+}, ɵ1$2 = function (...args) {
+    if (this._inProgress) {
+        return -1;
+    }
+    let goodAdds = args;
+    this._beforeChange();
+    let result;
+    let objPrototype = Object.getPrototypeOf(this);
+    if (objPrototype.push) {
+        result = objPrototype.push.apply(this, goodAdds);
     }
+    else {
+        result = Array.prototype.push.apply(this, goodAdds);
+    }
+    processAdds(this, goodAdds);
+    return result;
+}, ɵ2$1 = function (...args) {
+    let goodAdds = this._getGoodAdds(args);
+    if (!goodAdds.length) {
+        return this.length;
+    }
+    this._beforeChange();
+    let result;
+    let objPrototype = Object.getPrototypeOf(this);
+    if (objPrototype.unshift) {
+        result = objPrototype.unshift.apply(this, goodAdds);
+    }
+    else {
+        result = Array.prototype.unshift.apply(this, goodAdds);
+    }
+    processAdds(this, goodAdds);
+    return result;
+}, ɵ3$1 = function () {
+    this._beforeChange();
+    let result;
+    let objPrototype = Object.getPrototypeOf(this);
+    if (objPrototype.pop) {
+        result = objPrototype.pop.apply(this);
+    }
+    else {
+        result = Array.prototype.pop.apply(this);
+    }
+    processRemoves(this, [result]);
+    return result;
+}, ɵ4$1 = function () {
+    this._beforeChange();
+    let result;
+    let objPrototype = Object.getPrototypeOf(this);
+    if (objPrototype.shift) {
+        result = objPrototype.shift.apply(this);
+    }
+    else {
+        result = Array.prototype.shift.apply(this);
+    }
+    processRemoves(this, [result]);
+    return result;
+}, ɵ5$1 = function (...args) {
+    let goodAdds = this._getGoodAdds(core.arraySlice(args, 2));
+    let newArgs = core.arraySlice(args, 0, 2).concat(goodAdds);
+    this._beforeChange();
+    let result;
+    let objPrototype = Object.getPrototypeOf(this);
+    if (objPrototype.splice) {
+        result = objPrototype.splice.apply(this, newArgs);
+    }
+    else {
+        result = Array.prototype.splice.apply(this, newArgs);
+    }
+    processRemoves(this, result);
+    if (goodAdds.length) {
+        processAdds(this, goodAdds);
+    }
+    return result;
+}, ɵ6$1 = function () {
+    return this.parent.entityAspect || this.parent.complexAspect.getEntityAspect();
+}, ɵ7$1 = function () {
+    return this.getEntityAspect();
+}, ɵ8$1 = function () {
+    let em = this.getEntityAspect().entityManager;
+    return em && em._pendingPubs;
+}, ɵ9$1 = function () {
+    // default is to do nothing
+};
+let mixin = {
+    push: ɵ0$3,
+    _push: ɵ1$2,
+    unshift: ɵ2$1,
+    pop: ɵ3$1,
+    shift: ɵ4$1,
+    splice: ɵ5$1,
+    getEntityAspect: ɵ6$1,
+    _getEventParent: ɵ7$1,
+    _getPendingPubs: ɵ8$1,
+    _beforeChange: ɵ9$1
 };
 function updateEntityState(obsArray) {
     let entityAspect = obsArray.getEntityAspect();
@@ -13729,14 +13277,14 @@ function initializeParent(obsArray, parent, parentProperty) {
     obsArray.parent = parent;
     obsArray.parentProperty = parentProperty;
 }
-function processAdds$2(obsArray, adds) {
+function processAdds(obsArray, adds) {
     obsArray._processAdds(adds);
     // this is referencing the name of the method on the complexArray not the name of the event
     //var args = { added: adds };
     //args[obsArray._typeName] = obsArray;
     publish(obsArray, "arrayChanged", { array: obsArray, added: adds });
 }
-function processRemoves$2(obsArray, removes) {
+function processRemoves(obsArray, removes) {
     obsArray._processRemoves(removes);
     // this is referencing the name of the method on the array not the name of the event
     publish(obsArray, "arrayChanged", { array: obsArray, removed: removes });
@@ -13767,6 +13315,23 @@ const observableArray = {
     initializeParent: initializeParent
 };
 
+const ɵ0$4 = function (callback, errorCallback) {
+    let parent = this.parentEntity;
+    let query = EntityQuery.fromEntityNavigation(this.parentEntity, this.navigationProperty);
+    let em = parent.entityAspect.entityManager;
+    return em.executeQuery(query, callback, errorCallback);
+}, ɵ1$3 = function () {
+    return this.parentEntity.entityAspect;
+}, ɵ2$2 = function () {
+    let em = this.parentEntity.entityAspect.entityManager;
+    return em && em._pendingPubs;
+}, ɵ3$2 = function (adds) {
+    return getGoodAdds(this, adds);
+}, ɵ4$2 = function (adds) {
+    processAdds$1(this, adds);
+}, ɵ5$2 = function (removes) {
+    processRemoves$1(this, removes);
+};
 let relationArrayMixin = {
     /**
     Relation arrays are not actually classes, they are objects that mimic arrays. A relation array is collection of
@@ -13803,31 +13368,15 @@ let relationArrayMixin = {
     @param [errorCallback] {Function}
     @return {Promise}
     **/
-    load: function (callback, errorCallback) {
-        let parent = this.parentEntity;
-        let query = EntityQuery.fromEntityNavigation(this.parentEntity, this.navigationProperty);
-        let em = parent.entityAspect.entityManager;
-        return em.executeQuery(query, callback, errorCallback);
-    },
-    _getEventParent: function () {
-        return this.parentEntity.entityAspect;
-    },
-    _getPendingPubs: function () {
-        let em = this.parentEntity.entityAspect.entityManager;
-        return em && em._pendingPubs;
-    },
+    load: ɵ0$4,
+    _getEventParent: ɵ1$3,
+    _getPendingPubs: ɵ2$2,
     // virtual impls
-    _getGoodAdds: function (adds) {
-        return getGoodAdds$1(this, adds);
-    },
-    _processAdds: function (adds) {
-        processAdds$1(this, adds);
-    },
-    _processRemoves: function (removes) {
-        processRemoves$1(this, removes);
-    }
+    _getGoodAdds: ɵ3$2,
+    _processAdds: ɵ4$2,
+    _processRemoves: ɵ5$2
 };
-function getGoodAdds$1(relationArray, adds) {
+function getGoodAdds(relationArray, adds) {
     let goodAdds = checkForDups(relationArray, adds);
     if (!goodAdds.length) {
         return goodAdds;
@@ -13935,6 +13484,28 @@ function makeRelationArray(arr, parentEntity, navigationProperty) {
     return core.extend(arrX, relationArrayMixin);
 }
 
+const ɵ0$5 = function (adds) {
+    return getGoodAdds$1(this, adds);
+}, ɵ1$4 = function () {
+    observableArray.updateEntityState(this);
+}, ɵ2$3 = function (adds) {
+    processAdds$2(this, adds);
+}, ɵ3$3 = function (removes) {
+    processRemoves$2(this, removes);
+}, ɵ4$3 = function () {
+    if (!this._origValues)
+        return;
+    let that = this;
+    this.forEach(function (co) {
+        clearAspect(co, that);
+    });
+    this.length = 0;
+    this._origValues.forEach(function (co) {
+        that.push(co);
+    });
+}, ɵ5$3 = function () {
+    this._origValues = null;
+};
 let complexArrayMixin = {
     // complexArray will have the following props
     //    parent
@@ -13969,43 +13540,22 @@ let complexArrayMixin = {
     @readOnly
     **/
     // virtual impls
-    _getGoodAdds: function (adds) {
-        return getGoodAdds(this, adds);
-    },
-    _beforeChange: function () {
-        observableArray.updateEntityState(this);
-    },
-    _processAdds: function (adds) {
-        processAdds(this, adds);
-    },
-    _processRemoves: function (removes) {
-        processRemoves(this, removes);
-    },
-    _rejectChanges: function () {
-        if (!this._origValues)
-            return;
-        let that = this;
-        this.forEach(function (co) {
-            clearAspect(co, that);
-        });
-        this.length = 0;
-        this._origValues.forEach(function (co) {
-            that.push(co);
-        });
-    },
-    _acceptChanges: function () {
-        this._origValues = null;
-    }
+    _getGoodAdds: ɵ0$5,
+    _beforeChange: ɵ1$4,
+    _processAdds: ɵ2$3,
+    _processRemoves: ɵ3$3,
+    _rejectChanges: ɵ4$3,
+    _acceptChanges: ɵ5$3
 };
 // local functions
-function getGoodAdds(complexArray, adds) {
+function getGoodAdds$1(complexArray, adds) {
     // remove any that are already added here
     return adds.filter(function (a) {
         // return a.parent !== complexArray.parent;  // TODO: check if this is actually a bug in original breezejs ???
         return a.complexAspect == null || a.complexAspect.parent !== complexArray.parent;
     });
 }
-function processAdds(complexArray, adds) {
+function processAdds$2(complexArray, adds) {
     adds.forEach(function (a) {
         // if (a.parent != null) { // TODO: check if this is actually a bug in original breezejs ???
         if (a.complexAspect && a.complexAspect.parent != null) {
@@ -14014,7 +13564,7 @@ function processAdds(complexArray, adds) {
         setAspect(a, complexArray);
     });
 }
-function processRemoves(complexArray, removes) {
+function processRemoves$2(complexArray, removes) {
     removes.forEach(function (a) {
         clearAspect(a, complexArray);
     });
@@ -14049,6 +13599,28 @@ function makeComplexArray(arr, parent, parentProperty) {
     return core.extend(arrX, complexArrayMixin);
 }
 
+const ɵ0$6 = function (adds) {
+    return adds;
+}, ɵ1$5 = function () {
+    let entityAspect = this.getEntityAspect();
+    if (entityAspect.entityState.isUnchanged()) {
+        entityAspect.setModified();
+    }
+    if (entityAspect.entityState.isModified() && !this._origValues) {
+        this._origValues = this.slice(0);
+    }
+}, ɵ2$4 = function (adds) {
+    // nothing needed
+}, ɵ3$4 = function (removes) {
+    // nothing needed;
+}, ɵ4$4 = function () {
+    if (!this._origValues)
+        return;
+    this.length = 0;
+    Array.prototype.push.apply(this, this._origValues);
+}, ɵ5$4 = function () {
+    this._origValues = null;
+};
 // TODO: mixin impl is not very typesafe
 // Not needed
 // interface IPrimitiveArray extends IObservableArray {
@@ -14090,33 +13662,12 @@ let primitiveArrayMixin = {
     @readOnly
     **/
     // virtual impls
-    _getGoodAdds: function (adds) {
-        return adds;
-    },
-    _beforeChange: function () {
-        let entityAspect = this.getEntityAspect();
-        if (entityAspect.entityState.isUnchanged()) {
-            entityAspect.setModified();
-        }
-        if (entityAspect.entityState.isModified() && !this._origValues) {
-            this._origValues = this.slice(0);
-        }
-    },
-    _processAdds: function (adds) {
-        // nothing needed
-    },
-    _processRemoves: function (removes) {
-        // nothing needed;
-    },
-    _rejectChanges: function () {
-        if (!this._origValues)
-            return;
-        this.length = 0;
-        Array.prototype.push.apply(this, this._origValues);
-    },
-    _acceptChanges: function () {
-        this._origValues = null;
-    }
+    _getGoodAdds: ɵ0$6,
+    _beforeChange: ɵ1$5,
+    _processAdds: ɵ2$4,
+    _processRemoves: ɵ3$4,
+    _rejectChanges: ɵ4$4,
+    _acceptChanges: ɵ5$4
 };
 // local functions
 /** For use by breeze plugin authors only. The class is for use in building a [[IModelLibraryAdapter]] implementation.
@@ -14191,5 +13742,5 @@ if (win) {
  * Generated bundle index. Do not edit.
  */
 
-export { AbstractDataServiceAdapter, AndOrPredicate, AnyAllPredicate, AutoGeneratedKeyType, BinaryPredicate, BreezeConfig, BreezeEnum, BreezeEvent, ComplexAspect, ComplexType, DataProperty, DataService, DataType, EntityAction, EntityAspect, EntityKey, EntityManager, EntityQuery, EntityState, EntityType, ExpandClause, FetchStrategy, FilterQueryOp, FnExpr, InterfaceRegistry, JsonResultsAdapter, KeyGenerator, LitExpr, LocalQueryComparisonOptions, MappingContext, MergeStrategy, MetadataStore, NamingConvention, NavigationProperty, OrderByClause, Predicate, PropExpr, QueryOptions, SaveOptions, SelectClause, UnaryPredicate, ValidationError, ValidationOptions, Validator, assertConfig, assertParam, breeze, config, core, makeComplexArray, makePrimitiveArray, makeRelationArray };
-//# sourceMappingURL=breeze-client.mjs.map
+export { AbstractDataServiceAdapter, AndOrPredicate, AnyAllPredicate, AutoGeneratedKeyType, BinaryPredicate, BreezeConfig, BreezeEnum, BreezeEvent, ComplexAspect, ComplexType, DataProperty, DataService, DataType, EntityAction, EntityAspect, EntityKey, EntityManager, EntityQuery, EntityState, EntityType, ExpandClause, FetchStrategy, FilterQueryOp, FnExpr, InterfaceRegistry, JsonResultsAdapter, KeyGenerator, LitExpr, LocalQueryComparisonOptions, MappingContext, MergeStrategy, MetadataStore, NamingConvention, NavigationProperty, OrderByClause, Predicate, PropExpr, QueryOptions, SaveOptions, SelectClause, UnaryPredicate, ValidationError, ValidationOptions, Validator, assertConfig, assertParam, breeze, config, core, makeComplexArray, makePrimitiveArray, makeRelationArray, PredicateExpression as ɵa, Param as ɵb, qualifyTypeName as ɵc, BooleanQueryOp as ɵd };
+//# sourceMappingURL=breeze-client.js.map