Merge branch 'master' of github.com:andrei-markeev/DefinitelyTyped into andrei-markeev-master

Conflicts:
	camljs/camljs-tests.ts

Author: vvakame

camljs/camljs-tests.ts

@@ -31,8 +31,8 @@ caml = new CamlBuilder().Where()
 	)
 	.ToString();
 
-caml = new CamlBuilder().Where()
-	.LookupIdField("Category").In([2, 3, 10])
+var caml = new CamlBuilder().Where()
+	.LookupField("Category").Id().In([2, 3, 10])
 	.And()
 	.DateField("ExpirationDate").GreaterThan(CamlBuilder.CamlValues.Now)
 	.OrderBy("ExpirationDate")

camljs/camljs.d.ts

@@ -4,48 +4,14 @@
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
 
 
-declare module Sys {
-    class StringBuilder {
-        /** Appends a string to the string builder */
-        public append(s: string): void;
-        /** Appends a line to the string builder */
-        public appendLine(s: string): void;
-        /** Clears the contents of the string builder */
-        public clear(): void;
-        /** Indicates wherever the string builder is empty */
-        public isEmpty(): boolean;
-        /** Gets the contents of the string builder as a string */
-        public toString(): string;
-    }
-}
-declare module SP {
-    /** Defines a writer that provides a set of methods to append text in XML format. Use the static SP.XmlWriter.create(sb) Method to create an SP.XmlWriter object with the Sys.StringBuilder object you pass in. */
-    class XmlWriter {
-        /** Creates a new instance of the XmlWriter class with the specified string builder. */
-        static create(sb: Sys.StringBuilder): XmlWriter;
-        /** Appends a start element tag with the specified name in XML format to the object?s string builder. */
-        public writeStartElement(tagName: string): void;
-        /** Appends an element with the specified tag name and value in XML format to the string builder. */
-        public writeElementString(tagName: string, value: string): void;
-        /** Appends an end element tag in XML format to the object?s string builder. This method appends the end element tag ?/>? if the start element tag is not closed; otherwise, it appends a full end element tag ?</tagName>? to the string builder. */
-        public writeEndElement(): void;
-        /** Appends an attribute with the specified name and value in XML format to the object?s string builder. */
-        public writeAttributeString(localName: string, value: string): void;
-        /** This method only appends the name of the attribute. You can append the value of the attribute by calling the SP.XmlWriter.writeString(value) Method, and close the attribute by calling the SP.XmlWriter.writeEndAttribute() Method. */
-        public writeStartAttribute(localName: string): void;
-        /** Appends an end of an attribute in XML format to the object?s string builder. */
-        public writeEndAttribute(): void;
-        /** Appends the specified value for an element tag or attribute to the object?s string builder. */
-        public writeString(value: string): void;
-        /** Appends the specified text to the object?s string builder. */
-        public writeRaw(xml: string): void;
-        /** This member is reserved for internal use and is not intended to be used directly from your code. */
-        public close(): void;
-    }
-}
 declare class CamlBuilder {
     constructor();
+    /** Generate CAML Query, starting from <Where> tag */
     public Where(): CamlBuilder.IFieldExpression;
+    /** Generate <View> tag for SP.CamlQuery
+    @param viewFields If omitted, default view fields are requested; otherwise, only values for the fields with the specified internal names are returned.
+    Specifying view fields is a good practice, as it decreases traffic between server and client. */
+    public View(viewFields?: string[]): CamlBuilder.IView;
     /** Use for:
     1. SPServices CAMLQuery attribute
     2. Creating partial expressions
@@ -54,15 +20,49 @@ declare class CamlBuilder {
     static Expression(): CamlBuilder.IFieldExpression;
 }
 declare module CamlBuilder {
-    interface IView {
+    interface IView extends IJoinable, IFinalizable {
         Query(): IQuery;
+        RowLimit(limit: number, paged?: boolean): IView;
+        Scope(scope: ViewScope): IView;
+    }
+    interface IJoinable {
+        /** Join the list you're querying with another list.
+        Joins are only allowed through a lookup field relation.
+        @param lookupFieldInternalName Internal name of the lookup field, that points to the list you're going to join in.
+        @alias alias for the joined list */
+        InnerJoin(lookupFieldInternalName: string, alias: string): IJoin;
+        /** Join the list you're querying with another list.
+        Joins are only allowed through a lookup field relation.
+        @param lookupFieldInternalName Internal name of the lookup field, that points to the list you're going to join in.
+        @alias alias for the joined list */
+        LeftJoin(lookupFieldInternalName: string, alias: string): IJoin;
+    }
+    interface IJoin extends IJoinable {
+        /** Select projected field for using in the main Query body
+        @param remoteFieldAlias By this alias, the field can be used in the main Query body. */
+        Select(remoteFieldInternalName: string, remoteFieldAlias: string): IProjectableView;
+    }
+    interface IProjectableView extends IView {
+        /** Select projected field for using in the main Query body
+        @param remoteFieldAlias By this alias, the field can be used in the main Query body. */
+        Select(remoteFieldInternalName: string, remoteFieldAlias: string): IProjectableView;
+    }
+    enum ViewScope {
+        /**  */
+        Recursive = 0,
+        /**  */
+        RecursiveAll = 1,
+        /**  */
+        FilesOnly = 2,
     }
     interface IQuery {
         Where(): IFieldExpression;
     }
     interface IFinalizable {
         /** Get the resulting CAML query as string */
         ToString(): string;
+        /** Get the resulting CAML query as SP.CamlQuery object */
+        ToCamlQuery(): any;
     }
     interface ISortable extends IFinalizable {
         /** Adds OrderBy clause to the query
@@ -81,7 +81,7 @@ declare module CamlBuilder {
     interface IGroupable extends ISortable {
         /** Adds GroupBy clause to the query.
         @param collapse If true, only information about the groups is retrieved, otherwise items are also retrieved. */
-        GroupBy(fieldInternalName): IGroupedQuery;
+        GroupBy(fieldInternalName: any): IGroupedQuery;
     }
     interface IExpression extends IGroupable {
         /** Adds And clause to the query. */
@@ -122,12 +122,10 @@ declare module CamlBuilder {
         UserField(internalName: string): IUserFieldExpression;
         /** Specifies that a condition will be tested against the field with the specified internal name, and the type of this field is Lookup */
         LookupField(internalName: string): ILookupFieldExpression;
-        /** DEPRECATED. Please use LookupField(...).Id() instead */
-        LookupIdField(internalName: string): INumberFieldExpression;
         /** Specifies that a condition will be tested against the field with the specified internal name, and the type of this field is LookupMulti */
         LookupMultiField(internalName: string): ILookupMultiFieldExpression;
         /** Specifies that a condition will be tested against the field with the specified internal name, and the type of this field is UserMulti */
-        UserMultiField(internalName: string): ILookupMultiFieldExpression;
+        UserMultiField(internalName: string): IUserMultiFieldExpression;
         /** Specifies that a condition will be tested against the field with the specified internal name, and the type of this field is Date */
         DateField(internalName: string): IDateTimeFieldExpression;
         /** Specifies that a condition will be tested against the field with the specified internal name, and the type of this field is DateTime */
@@ -289,30 +287,52 @@ declare module CamlBuilder {
         ValueAsBoolean(): IBooleanFieldExpression;
     }
     interface ILookupMultiFieldExpression {
-        /** Checks whether the value of the field is equal to the specified value */
-        EqualTo(value: string): IExpression;
-        /** Checks whether the value of the field is not equal to the specified value */
-        NotEqualTo(value: string): IExpression;
-        /** Checks whether the values of the field includes the specified value */
-        Includes(value): IExpression;
-        /** Checks whether the values of the field not includes the specified value */
-        NotIncludes(value): IExpression;
+        /** Checks a condition against every item in the multi lookup value */
+        IncludesSuchItemThat(): ILookupFieldExpression;
+        /** Checks whether the field values collection is empty */
+        IsNull(): IExpression;
+        /** Checks whether the field values collection is not empty */
+        IsNotNull(): IExpression;
+        /** DEPRECATED: use "IncludesSuchItemThat().ValueAsText().EqualTo(value)" instead. */
+        Includes(value: any): IExpression;
+        /** DEPRECATED: use "IncludesSuchItemThat().ValueAsText().NotEqualTo(value)" instead. */
+        NotIncludes(value: any): IExpression;
+        /** DEPRECATED: "Eq" operation in CAML works exactly the same as "Includes". To avoid confusion, please use Includes. */
+        EqualTo(value: any): IExpression;
+        /** DEPRECATED: "Neq" operation in CAML works exactly the same as "NotIncludes". To avoid confusion, please use NotIncludes. */
+        NotEqualTo(value: any): IExpression;
+    }
+    interface IUserMultiFieldExpression {
+        /** Checks a condition against every item in the multi lookup value */
+        IncludesSuchItemThat(): IUserFieldExpression;
+        /** Checks whether the field values collection is empty */
+        IsNull(): IExpression;
+        /** Checks whether the field values collection is not empty */
+        IsNotNull(): IExpression;
+        /** DEPRECATED: use "IncludesSuchItemThat().ValueAsText().EqualTo(value)" instead. */
+        Includes(value: any): IExpression;
+        /** DEPRECATED: use "IncludesSuchItemThat().ValueAsText().NotEqualTo(value)" instead. */
+        NotIncludes(value: any): IExpression;
+        /** DEPRECATED: "Eq" operation in CAML works exactly the same as "Includes". To avoid confusion, please use Includes. */
+        EqualTo(value: any): IExpression;
+        /** DEPRECATED: "Neq" operation in CAML works exactly the same as "NotIncludes". To avoid confusion, please use NotIncludes. */
+        NotEqualTo(value: any): IExpression;
     }
     enum DateRangesOverlapType {
         /** Returns events for today */
-        Now,
+        Now = 0,
         /** Returns events for one day, specified by CalendarDate in QueryOptions */
-        Day,
+        Day = 1,
         /** Returns events for one week, specified by CalendarDate in QueryOptions */
-        Week,
+        Week = 2,
         /** Returns events for one month, specified by CalendarDate in QueryOptions.
         Caution: usually also returns few days from previous and next months */
-        Month,
+        Month = 3,
         /** Returns events for one year, specified by CalendarDate in QueryOptions */
-        Year,
+        Year = 4,
     }
     class Internal {
-        static createView(): IView;
+        static createView(viewFields?: string[]): IView;
         static createWhere(): IFieldExpression;
         static createExpression(): IFieldExpression;
     }