From c2b1f73d0ac63d81c76ae3c33172251bd67ae28b Mon Sep 17 00:00:00 2001 From: leeyeh Date: Tue, 1 Aug 2017 18:41:40 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=90=9B=20Fix=20ts=20error=20by=20expo?= =?UTF-8?q?rt=20the=20AV=20namespace?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fix https://leanticket.cn/tickets/13350 --- leanengine.d.ts | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/leanengine.d.ts b/leanengine.d.ts index 299c8e4..ce10fc0 100644 --- a/leanengine.d.ts +++ b/leanengine.d.ts @@ -1,6 +1,6 @@ import {Promise} from 'es6-promise'; import {Request, RequestHandler} from 'express'; -import {User as LCUser, Object as LCObject} from 'leancloud-storage'; +import {User, Object as LCObject} from 'leancloud-storage'; declare namespace Express { export interface Request { @@ -12,17 +12,18 @@ declare namespace Express { sessionToken: string }; - currentUser?: LCUser; + currentUser?: User; sessionToken?: string; } export interface Response { - saveCurrentUser(user: LCUser); + saveCurrentUser(user: User); clearCurrentUser(); } } -declare module 'leanengine' { +declare namespace AV { + interface InitializeOptions { appId: string, appKey: string, @@ -39,7 +40,7 @@ declare module 'leanengine' { export function express(options?: MiddlewareOptions): RequestHandler; export function koa(options?: MiddlewareOptions): Function; - export class Object { + export class Object extends LCObject { disableBeforeHook(): void; disableAfterHook(): void; } @@ -57,7 +58,7 @@ declare module 'leanengine' { interface RunOptions { remote?: boolean, - user?: LCUser, + user?: User, sessionToken?: string, req?: Request } @@ -78,17 +79,17 @@ declare module 'leanengine' { interface CloudFunctionRequest { meta: CloudFunctionRequestMeta, params: Object, - currentUser?: LCUser, + currentUser?: User, sessionToken?: string } interface ClassHookRequest { - object: LCObject, - currentUser?: LCUser + object: Object, + currentUser?: User } interface UserHookRequest { - currentUser: LCUser + currentUser: User } type CloudFunction = (request: CloudFunctionRequest) => Promise; @@ -129,3 +130,5 @@ declare module 'leanengine' { export function HttpsRedirect(options?: MiddlewareOptions): RequestHandler; } } + +export = AV; \ No newline at end of file From b4bc987c070632f839b44f5b46e3649c2dec59bf Mon Sep 17 00:00:00 2001 From: jysperm Date: Wed, 2 Aug 2017 13:52:06 +0800 Subject: [PATCH 2/2] :bookmark: Release 2.0.5 --- CHANGELOG.md | 4 ++++ leanengine.d.ts | 4 ++-- package.json | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 583207c..86867f9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # 更新日志 +## v2.0.5 + +- 修复 TypeScript 定义文件与 leancloud-storage 配合工作的问题。 + ## v2.0.4 - 修复使用 remote 模式调用 `Cloud.run` 时,user 参数处理不正确的问题。 diff --git a/leanengine.d.ts b/leanengine.d.ts index ce10fc0..e6f814a 100644 --- a/leanengine.d.ts +++ b/leanengine.d.ts @@ -23,7 +23,7 @@ declare namespace Express { } declare namespace AV { - + interface InitializeOptions { appId: string, appKey: string, @@ -131,4 +131,4 @@ declare namespace AV { } } -export = AV; \ No newline at end of file +export = AV; diff --git a/package.json b/package.json index 40fd3ae..e0ec4a8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "leanengine", - "version": "2.0.4", + "version": "2.0.5", "description": "LeanCloud LeanEngine Node.js SDK.", "repository": { "type": "git",