reverted back Schema properties to static after proper implementation and code updates. Also replaced ServiceObject related instanceof call with TypeContainer

Author: gautamsi

src/js/Core/PropertyBag.ts

@@ -7,28 +7,25 @@ import {ServiceObject} from "./ServiceObjects/ServiceObject";
 import {PropertySet} from "./PropertySet";
 import {ComplexProperty} from "../ComplexProperties/ComplexProperty";
 import {IOutParam} from "../Interfaces/IOutParam";
+import {Item} from "./ServiceObjects/Items/Item";
 import {Folder} from "./ServiceObjects/Folders/Folder";
 import {ComplexPropertyDefinitionBase} from "../PropertyDefinitions/ComplexPropertyDefinitionBase";
 import {IOwnedProperty} from "../Interfaces/IOwnedProperty";
 import {BasePropertySet} from "../Enumerations/BasePropertySet";
 import {EwsServiceXmlReader} from "./EwsServiceXmlReader";
 import {ISelfValidate} from "../Interfaces/ISelfValidate";
-
 import {ExchangeVersion} from "../Enumerations/ExchangeVersion";
 import {PropertyDefinitionFlags} from "../Enumerations/PropertyDefinitionFlags";
 import {EwsServiceXmlWriter} from "./EwsServiceXmlWriter";
 import {EwsUtilities} from "./EwsUtilities";
 import {EwsLogging} from "./EwsLogging";
 import {XmlElementNames} from "../Core/XmlElementNames";
 import {XmlNamespace} from "../Enumerations/XmlNamespace";
-
 import {ICustomUpdateSerializer} from "../Interfaces/ICustomXmlUpdateSerializer";
-
 import {PropertyDefinition} from "../PropertyDefinitions/PropertyDefinition";
-
 import {DictionaryWithPropertyDefitionKey, KeyValuePair} from "../AltDictionary";
-
 import {StringHelper, TypeSystem} from "../ExtensionMethods";
+import {TypeContainer} from "../TypeContainer";
 
 
 //todo: should be done
@@ -135,8 +132,7 @@ export class PropertyBag {
         return false;
     }
     static GetPropertyUpdateItemName(serviceObject: ServiceObject): string {
-        //return serviceObject instanceof Folder ?
-        return serviceObject.InstanceType === XmlElementNames.Folder ? //removed instanceof operation to remove circular dependency.
+        return serviceObject instanceof TypeContainer.Folder ? //ref: //info: TypeContainer contains constructor of Folder (not instance) to evade circular dependency. Assigned at bootstarp
             XmlElementNames.Folder :
             XmlElementNames.Item;
     }
@@ -344,10 +340,10 @@ export class PropertyBag {
 
             if (!this.Owner.IsNew) {
                 // If owner is an item attachment, properties cannot be updated (EWS doesn't support updating item attachments)
-                var isItem = this.owner.InstanceType === XmlElementNames.Item;// this.owner instanceof Item;
+                var isItem = this.owner instanceof TypeContainer.Item;  //ref: //info: TypeContainer contains constructor of Item (not instance) to evade circular dependency. Assigned at bootstarp
                 //debugger;
                 //var ownerItem = <Item>this.Owner; - implemented IsAttachment on service object to remove dependency to Item object.
-                if (isItem && this.owner.IsAttachment) { // ownerItem.IsAttachment) {
+                if (isItem && (<Item>this.owner).IsAttachment) { // ownerItem.IsAttachment) {
                     throw new ServiceObjectPropertyException(Strings.ItemAttachmentCannotBeUpdated, propertyDefinition);
                 }
 

src/js/Core/ServiceObjects/Folders/Folder.ts

@@ -455,7 +455,7 @@ export class Folder extends ServiceObject {
      *
      * @return  {ServiceObjectSchema}      The schema associated with this type of object.
      */
-    GetSchema(): ServiceObjectSchema { return Schemas.FolderSchema; } //info: Schemas.FolderSchema is FolderSchema.Instance
+    GetSchema(): ServiceObjectSchema { return Schemas.FolderSchema.Instance; }
 
     /**
      * @internal Gets the name of the set field XML element.
@@ -655,10 +655,5 @@ export class Folder extends ServiceObject {
         if (this.PropertyBag.Contains(Schemas.FolderSchema.Permissions)) {
             this.Permissions.Validate();
         }
-    }
-
-    /**
-     * @internal ~~created this to help find serviceobject type, ServiceObjectInstance instanceof Item fails by creating circular dependency in javascript/typescript~~
-     */
-    get InstanceType(): string { return XmlElementNames.Folder; }
+    }    
 }

src/js/Core/ServiceObjects/Items/Appointment.ts

@@ -716,7 +716,7 @@ export class Appointment extends Item implements ICalendarActionProvider {
      *
      * @return  {ServiceObjectSchema}      The schema associated with this type of object.
      */
-    GetSchema(): ServiceObjectSchema { return Schemas.AppointmentSchema; } //info: Schemas.AppointmentSchema is AppointmentSchema.Instance
+    GetSchema(): ServiceObjectSchema { return Schemas.AppointmentSchema.Instance; }
 
     /**
      * @internal Gets the element name of item in XML

src/js/Core/ServiceObjects/Items/Contact.ts

@@ -529,7 +529,7 @@ export class Contact extends Item {
      *
      * @return  {ServiceObjectSchema}      The schema associated with this type of object.
      */
-    GetSchema(): ServiceObjectSchema { return Schemas.ContactSchema; } //info: Schemas.ContactSchema is ContactSchema.Instance
+    GetSchema(): ServiceObjectSchema { return Schemas.ContactSchema.Instance; }
 
     /**
      * @internal Gets the element name of item in XML

src/js/Core/ServiceObjects/Items/EmailMessage.ts

@@ -37,39 +37,39 @@ export class EmailMessage extends Item {
     get ToRecipients(): EmailAddressCollection {
         return <EmailAddressCollection>this.PropertyBag._getItem(Schemas.EmailMessageSchema.ToRecipients);
     }
-    
+
     /**
      * Gets the list of Bcc recipients for the e-mail message.
      *
      */
     get BccRecipients(): EmailAddressCollection {
         return <EmailAddressCollection>this.PropertyBag._getItem(Schemas.EmailMessageSchema.BccRecipients);
     }
-    
+
     /**
      * Gets the list of Cc recipients for the e-mail message.
      *
      */
     get CcRecipients(): EmailAddressCollection {
         return <EmailAddressCollection>this.PropertyBag._getItem(Schemas.EmailMessageSchema.CcRecipients);
     }
-    
+
     /**
      * Gets the conversation topic of the e-mail message.
      *
      */
     get ConversationTopic(): string {
         return <string>this.PropertyBag._getItem(Schemas.EmailMessageSchema.ConversationTopic);
     }
-    
+
     /**
      * Gets the conversation index of the e-mail message.
      *
      */
     get ConversationIndex(): number[] {
         return <number[]>this.PropertyBag._getItem(Schemas.EmailMessageSchema.ConversationIndex);
     }
-    
+
     /**
      * Gets or sets the "on behalf" sender of the e-mail message.
      *
@@ -80,7 +80,7 @@ export class EmailMessage extends Item {
     set From(value: EmailAddress) {
         this.PropertyBag._setItem(Schemas.EmailMessageSchema.From, value);
     }
-    
+
     /**
      * Gets or sets a value indicating whether this is an associated message.
      *
@@ -91,7 +91,7 @@ export class EmailMessage extends Item {
     set IsAssociated(value: boolean) {
         this.PropertyBag._setItem(Schemas.ItemSchema.IsAssociated, value);
     }
-    
+
     /**
      * Gets or sets a value indicating whether a read receipt is requested for the e-mail message.
      *
@@ -102,7 +102,7 @@ export class EmailMessage extends Item {
     set IsDeliveryReceiptRequested(value: boolean) {
         this.PropertyBag._setItem(Schemas.EmailMessageSchema.IsDeliveryReceiptRequested, value);
     }
-    
+
     /**
      * Gets or sets a value indicating whether the e-mail message is read.
      *
@@ -113,7 +113,7 @@ export class EmailMessage extends Item {
     set IsRead(value: boolean) {
         this.PropertyBag._setItem(Schemas.EmailMessageSchema.IsRead, value);
     }
-    
+
     /**
      * Gets or sets a value indicating whether a read receipt is requested for the e-mail message.
      *
@@ -124,7 +124,7 @@ export class EmailMessage extends Item {
     set IsReadReceiptRequested(value: boolean) {
         this.PropertyBag._setItem(Schemas.EmailMessageSchema.IsReadReceiptRequested, value);
     }
-    
+
     /**
      * Gets or sets a value indicating whether a response is requested for the e-mail message.
      *
@@ -135,15 +135,15 @@ export class EmailMessage extends Item {
     set IsResponseRequested(value: boolean) {
         this.PropertyBag._setItem(Schemas.EmailMessageSchema.IsResponseRequested, value);
     }
-    
+
     /**
      * Gets the Internat Message Id of the e-mail message.
      *
      */
     get InternetMessageId(): string {
         return <string>this.PropertyBag._getItem(Schemas.EmailMessageSchema.InternetMessageId);
     }
-    
+
     /**
      * Gets or sets the references of the e-mail message.
      *
@@ -154,15 +154,15 @@ export class EmailMessage extends Item {
     set References(value: string) {
         this.PropertyBag._setItem(Schemas.EmailMessageSchema.References, value);
     }
-    
+
     /**
      * Gets a list of e-mail addresses to which replies should be addressed.
      *
      */
     get ReplyTo(): EmailAddressCollection {
         return <EmailAddressCollection>this.PropertyBag._getItem(Schemas.EmailMessageSchema.ReplyTo);
     }
-    
+
     /**
      * Gets or sets the sender of the e-mail message.
      *
@@ -173,39 +173,39 @@ export class EmailMessage extends Item {
     set Sender(value: EmailAddress) {
         this.PropertyBag._setItem(Schemas.EmailMessageSchema.Sender, value);
     }
-    
+
     /**
      * Gets the ReceivedBy property of the e-mail message.
      *
      */
     get ReceivedBy(): EmailAddress {
         return <EmailAddress>this.PropertyBag._getItem(Schemas.EmailMessageSchema.ReceivedBy);
     }
-    
+
     /**
      * Gets the ReceivedRepresenting property of the e-mail message.
      *
      */
     get ReceivedRepresenting(): EmailAddress {
         return <EmailAddress>this.PropertyBag._getItem(Schemas.EmailMessageSchema.ReceivedRepresenting);
     }
-    
+
     /**
      * Gets the ApprovalRequestData property of the e-mail message.
      *
      */
     get ApprovalRequestData(): ApprovalRequestData {
         return <ApprovalRequestData>this.PropertyBag._getItem(Schemas.EmailMessageSchema.ApprovalRequestData);
     }
-    
+
     /**
      * Gets the VotingInformation property of the e-mail message.
      *
      */
     get VotingInformation(): VotingInformation {
         return <VotingInformation>this.PropertyBag._getItem(Schemas.EmailMessageSchema.VotingInformation);
-    }    
-    
+    }
+
     /**
      * Initializes an unsaved local instance of . To bind to an existing e-mail message, use EmailMessage.Bind() instead.
      *
@@ -243,7 +243,7 @@ export class EmailMessage extends Item {
     static Bind(service: ExchangeService, id: ItemId, propertySet: PropertySet = PropertySet.FirstClassProperties): IPromise<EmailMessage> {
         return service.BindToItem<EmailMessage>(id, propertySet, EmailMessage);
     }
-    
+
     /**
      * Creates a forward response to the message.
      *
@@ -253,7 +253,7 @@ export class EmailMessage extends Item {
         this.ThrowIfThisIsNew();
         return new ResponseMessage(this, ResponseMessageType.Forward);
     }
-    
+
     /**
      * Creates a reply response to the message.
      *
@@ -266,7 +266,7 @@ export class EmailMessage extends Item {
             this,
             replyAll ? ResponseMessageType.ReplyAll : ResponseMessageType.Reply);
     }
-    
+
     //Forward(bodyPrefix: MessageBody, toRecipients: EmailAddress[]): IPromise<void> { throw new Error("EmailMessage.ts - Forward : Not implemented."); }
     //Forward(bodyPrefix: MessageBody, toRecipients: System.Collections.Generic.IEnumerable<T>): IPromise<void> { throw new Error("EmailMessage.ts - Forward : Not implemented."); }
     /**
@@ -283,28 +283,28 @@ export class EmailMessage extends Item {
 
         return responseMessage.SendAndSaveCopy();
     }
-    
+
     /**
      * @internal Gets the minimum required server version.
      *
      * @return  {ExchangeVersion}      Earliest Exchange version in which this service object type is supported.
      */
     GetMinimumRequiredServerVersion(): ExchangeVersion { return ExchangeVersion.Exchange2007_SP1; }
-    
+
     /**
      * @internal Internal method to return the schema associated with this type of object.
      *
      * @return  {ServiceObjectSchema}      The schema associated with this type of object.
      */
-    GetSchema(): ServiceObjectSchema { return Schemas.EmailMessageSchema; } //info: Schemas.EmailMessageSchema is EmailMessageSchema.Instance
-    
+    GetSchema(): ServiceObjectSchema { return Schemas.EmailMessageSchema.Instance; }
+
     /**
      * @internal Gets the element name of item in XML
      * 
      * @return  {string} name of elelment
      */
     GetXmlElementName(): string { return XmlElementNames.Message; }
-    
+
     /**
      * Send message.
      *
@@ -334,7 +334,7 @@ export class EmailMessage extends Item {
         else {
             // Regardless of whether item is dirty or not, if it has unprocessed
             // attachment changes, process them now.
-            
+
             debugger; //todo: check - check for attachment save() promise. 
             return PromiseFactory.resolve(
                 // Validate and save attachments before sending.
@@ -353,7 +353,7 @@ export class EmailMessage extends Item {
                 });
         }
     }
-    
+
     /**
      * Replies to the message. Calling this method results in a call to EWS.
      *
@@ -367,12 +367,12 @@ export class EmailMessage extends Item {
 
         return responseMessage.SendAndSaveCopy();
     }
-    
+
     /**
      * Sends this e-mail message. Calling this method results in at least one call to EWS.
      */
     Send(): IPromise<void> { return this.InternalSend(null, MessageDisposition.SendOnly); }
-    
+
     /**
      * Sends this e-mail message and saves a copy of it in the Sent Items folder. SendAndSaveCopy does not work if the message has unsaved attachments. In that case, the message must first be saved and then sent. Calling this method results in a call to EWS.
      *
@@ -404,7 +404,7 @@ export class EmailMessage extends Item {
         }
         return this.InternalSend(destinationFolderId, MessageDisposition.SendAndSaveCopy);
     }
-    
+
     /**
      * Suppresses the read receipt on the message. Calling this method results in a call to EWS.
      *

src/js/Core/ServiceObjects/Items/Item.ts

@@ -723,7 +723,7 @@ export class Item extends ServiceObject {
      *
      * @return  {ServiceObjectSchema}      The schema associated with this type of object.
      */
-    GetSchema(): ServiceObjectSchema { return Schemas.ItemSchema; } //info: Schemas.ItemSchema is ItemSchema.Instance;
+    GetSchema(): ServiceObjectSchema { return Schemas.ItemSchema.Instance; }
 
     /**
      * @internal Gets the element name of item in XML
@@ -1016,9 +1016,4 @@ export class Item extends ServiceObject {
         }
     }
 
-    /**
-     * @internal ~~created this to help find serviceobject type, ServiceObjectInstance instanceof Item fails by creating circular dependency in javascript/typescript~~
-     */
-    get InstanceType(): string { return XmlElementNames.Item; }
-
 }