chore: pick v2.2.0 changes

Author: leeyeh

changelog.md

@@ -56,7 +56,7 @@
 ### Bug Fixes
 * 修复了使用 masterKey 获取一个 object 后再次 save 可能会报 ACL 格式不正确的问题。
 
-## 2.1.0 (2017-01-20)
+# 2.1.0 (2017-01-20)
 ### Bug Fixes
 * 修复了 `File#toJSON` 序列化结果中缺失 objectId 等字段的问题
 * 修复了使用 `Query#containsAll`、`Query#containedIn` 或 `Query#notContainedIn` 方法传入大数组时查询结果可能为空的问题

src/utils/index.js

@@ -61,11 +61,11 @@ const ensureArray = target => {
 
 const transformFetchOptions = ({ keys, include, includeACL } = {}) => {
   const fetchOptions = {};
-  if (_.isArray(keys)) {
-    fetchOptions.keys = keys.join(',');
+  if (keys) {
+    fetchOptions.keys = ensureArray(keys).join(',');
   }
-  if (_.isArray(include)) {
-    fetchOptions.include = include.join(',');
+  if (include) {
+    fetchOptions.include = ensureArray(include).join(',');
   }
   if (includeACL) {
     fetchOptions.returnACL = includeACL;

storage.d.ts

@@ -8,6 +8,12 @@ declare namespace AV {
     export var applicationKey: string;
     export var masterKey: string;
 
+    interface FetchOptions {
+      keys?: string | string[];
+      include?: string | string[];
+      includeACL?: boolean;
+    }
+
     export interface AuthOptions {
         /**
          * In Cloud Code and Node only, causes the Master Key to be used for this request.
@@ -126,15 +132,15 @@ declare namespace AV {
         static withURL(name: string, url: string): File;
         static createWithoutData(objectId: string): File;
 
-        destroy<T>(): Promise<T>;
-        fetch<T>(options?: AuthOptions): Promise<T>;
+        destroy(): Promise<void>;
+        fetch(fetchOptions?: FetchOptions, options?: AuthOptions): Promise<File>;
         metaData(): any;
         metaData(metaKey: string): any;
         metaData(metaKey: string, metaValue: any): any;
         name(): string;
         ownerId(): string;
         url(): string;
-        save<T>(options?: AuthOptions): Promise<T>;
+        save(options?: AuthOptions): Promise<File>;
         setACL(acl?: ACL): any;
         size(): any;
         thumbnailURL(width: number, height: number): string;
@@ -255,7 +261,7 @@ declare namespace AV {
         destroy<T>(options?: Object.DestroyOptions): Promise<T>;
         dirty(attr: String): boolean;
         escape(attr: string): string;
-        fetch<T>(fetchOptions?: any, options?: Object.FetchOptions): Promise<T>;
+        fetch<T>(fetchOptions?: FetchOptions, options?: AuthOptions): Promise<T>;
         fetchWhenSave(enable: boolean): any;
         get(attr: string): any;
         getACL(): ACL;
@@ -281,8 +287,6 @@ declare namespace AV {
 
         interface DestroyAllOptions extends AuthOptions { }
 
-        interface FetchOptions extends AuthOptions { }
-
         interface SaveOptions extends AuthOptions, SilentOption, WaitOption { }
 
         interface SaveAllOptions extends AuthOptions { }
@@ -441,6 +445,7 @@ declare namespace AV {
         greaterThanOrEqualTo(key: string, value: any): Query;
         include(key: string): Query;
         include(keys: string[]): Query;
+        includeACL(value?: boolean): Query;
         lessThan(key: string, value: any): Query;
         lessThanOrEqualTo(key: string, value: any): Query;
         limit(n: number): Query;