refactor(*): 使用 db 模块将 reactivedb 的依赖封装起来

...并避免接口类型直接依赖 reactivedb。

src/Net/Net.ts

@@ -11,10 +11,8 @@ import { Observable } from 'rxjs/Observable'
 import { OperatorFunction } from 'rxjs/interfaces'
 import { BehaviorSubject } from 'rxjs/BehaviorSubject'
 import { exhaustMap } from 'rxjs/operators/exhaustMap'
-import { QueryToken, SelectorMeta, ProxySelector } from 'reactivedb/proxy'
-import { JoinMode, Predicate, Query } from 'reactivedb/interface'
-import { Database } from 'reactivedb'
 
+import { createQueryToken, Database, JoinMode, Predicate, ProxySelector, Query, QueryToken, SelectorMeta } from '../db'
 import { forEach, isNonNullable, ParsedWSMsg, WSMsgToDBHandler, GeneralSchemaDef } from '../utils'
 import { SDKLogger } from '../utils/Logger'
 
@@ -329,7 +327,7 @@ export class Net {
       proxySelector: cacheControl$
     })
 
-    return new QueryToken(cacheControl$).map(this.validate(result))
+    return createQueryToken(cacheControl$).map(this.validate(result))
   }
 
   bufferCUDResponse<T>(result: CUDApiResult<T>) {
@@ -381,7 +379,7 @@ export class Net {
             .delayWhen((v) => database.upsert(tableName, v))
             .do(() => this.requestMap.set(cacheKey, true))
             .concatMap(() => dbGetWithSelfJoinEnabled<T>(database, tableName, q).selector$)
-          token = new QueryToken(selector$)
+          token = createQueryToken(selector$)
         } else {
           token = dbGetWithSelfJoinEnabled<T>(database, tableName, q)
         }
@@ -390,7 +388,7 @@ export class Net {
         const selector$ = response$
           .delayWhen((v) => database.upsert(tableName, v))
           .concatMap(() => dbGetWithSelfJoinEnabled<T>(database, tableName, q).selector$)
-        token = new QueryToken(selector$)
+        token = createQueryToken(selector$)
         break
       default:
         throw new TypeError('unreachable code path')

src/SDK.ts

@@ -1,5 +1,5 @@
 import { Observable } from 'rxjs/Observable'
-import { Database } from 'reactivedb'
+import { Database } from './db'
 import { Net } from './Net'
 import { forEach, isNonNullable } from './utils'
 import { SDKFetch } from './SDKFetch'

src/apis/customfield/get.ts

@@ -1,7 +1,7 @@
 import { Observable } from 'rxjs/Observable'
-import { QueryToken } from 'reactivedb'
-
 import { CustomFieldId } from 'teambition-types'
+
+import { QueryToken } from '../../db'
 import { CacheStrategy } from '../../Net'
 import { CustomFieldSchema } from '../../schemas'
 import { SDK } from '../../SDK'

src/apis/customfieldlink/get-link-by-custom-field-id.ts

@@ -1,7 +1,7 @@
 import { Observable } from 'rxjs/Observable'
-import { QueryToken } from 'reactivedb'
-
 import { CustomFieldId } from 'teambition-types'
+
+import { QueryToken } from '../../db'
 import { CacheStrategy } from '../../Net'
 import { CustomFieldLinkSchema } from '../../schemas'
 import { SDK } from '../../SDK'

src/apis/customfieldlink/get.ts

@@ -1,6 +1,6 @@
 import { Observable } from 'rxjs/Observable'
-import { QueryToken } from 'reactivedb'
 
+import { QueryToken } from '../../db'
 import { CacheStrategy } from '../../Net'
 import { CustomFieldLinkSchema } from '../../schemas'
 import { ProjectId, CustomFieldBoundType } from 'teambition-types'

src/apis/event/get.ts

@@ -1,5 +1,5 @@
 import 'rxjs/add/operator/toArray'
-import { QueryToken } from 'reactivedb'
+import { QueryToken } from '../../db'
 import { SDK, CacheStrategy } from '../../SDK'
 import { EventSchema } from '../../schemas/Event'
 import { EventGenerator } from './EventGenerator'

src/apis/file/get.ts

@@ -1,5 +1,5 @@
 import { Observable } from 'rxjs/Observable'
-import { QueryToken } from 'reactivedb'
+import { QueryToken } from '../../db'
 import { SDK, CacheStrategy } from '../../SDK'
 import { SDKFetch } from '../../SDKFetch'
 import { FileSchema } from '../../schemas/File'

src/apis/like/get.ts

@@ -1,5 +1,5 @@
 import { Observable } from 'rxjs/Observable'
-import { QueryToken } from 'reactivedb'
+import { QueryToken } from '../../db'
 import { LikeSchema } from '../../schemas/Like'
 import { SDKFetch } from '../../SDKFetch'
 import { SDK, CacheStrategy } from '../../SDK'

src/apis/my/recent.ts

@@ -1,5 +1,5 @@
 import { Observable } from 'rxjs/Observable'
-import { QueryToken } from 'reactivedb'
+import { QueryToken } from '../../db'
 import { forEach } from '../../utils'
 import { SDKFetch } from '../../SDKFetch'
 import { SDK, CacheStrategy } from '../../SDK'

src/apis/post/get.ts

@@ -1,5 +1,5 @@
 import { Observable } from 'rxjs/Observable'
-import { QueryToken } from 'reactivedb'
+import { QueryToken } from '../../db'
 import { SDK, CacheStrategy } from '../../SDK'
 import { SDKFetch } from '../../SDKFetch'
 import { PostSchema } from '../../schemas/Post'

src/apis/post/getByTagId.ts

@@ -1,6 +1,5 @@
 import { Observable } from 'rxjs/Observable'
-import { OrderDescription } from 'reactivedb/interface'
-import { QueryToken } from 'reactivedb'
+import { OrderDescription, QueryToken } from '../../db'
 import { SDK, CacheStrategy } from '../../SDK'
 import { TagId } from 'teambition-types'
 import { PostSchema } from '../../schemas/Post'

src/apis/post/getMyProjects.ts

@@ -1,4 +1,4 @@
-import { QueryToken } from 'reactivedb'
+import { QueryToken } from '../../db'
 import { SDK, CacheStrategy } from '../../SDK'
 import { ProjectId, UserId } from 'teambition-types'
 import { PostSchema } from '../../schemas/Post'

src/apis/post/getProjects.ts

@@ -1,6 +1,5 @@
 import { Observable } from 'rxjs/Observable'
-import { OrderDescription } from 'reactivedb/interface'
-import { QueryToken } from 'reactivedb'
+import { OrderDescription, QueryToken } from '../../db'
 import { SDK, CacheStrategy } from '../../SDK'
 import { SDKFetch } from '../../SDKFetch'
 import { ProjectId } from 'teambition-types'

src/apis/project/get.ts

@@ -1,6 +1,6 @@
 import { Observable } from 'rxjs/Observable'
-import { QueryToken } from 'reactivedb'
 
+import { QueryToken } from '../../db'
 import { SDK, CacheStrategy } from '../../SDK'
 import { SDKFetch } from '../../SDKFetch'
 import { ProjectId } from 'teambition-types'

src/apis/tag/get.ts

@@ -1,6 +1,6 @@
 import { Observable } from 'rxjs/Observable'
-import { QueryToken } from 'reactivedb'
 
+import { QueryToken } from '../../db'
 import { SDK } from '../../SDK'
 import { SDKFetch } from '../../SDKFetch'
 import { ProjectId, OrganizationId, TagType } from 'teambition-types'

src/apis/task/get.ts

@@ -1,5 +1,5 @@
 import { Observable } from 'rxjs/Observable'
-import { QueryToken } from 'reactivedb'
+import { QueryToken } from '../../db'
 import { SDKFetch } from '../../SDKFetch'
 import { SDK, CacheStrategy } from '../../SDK'
 import { TaskSchema } from '../../schemas/Task'

src/apis/user/get.ts

@@ -1,4 +1,4 @@
-import { QueryToken } from 'reactivedb'
+import { QueryToken } from '../../db'
 import { SDK, CacheStrategy } from '../../SDK'
 import { UserMe } from '../../schemas/UserMe'
 

src/db.ts

@@ -0,0 +1,50 @@
+import { Observable } from 'rxjs/Observable'
+import { ErrorObservable } from 'rxjs/observable/ErrorObservable'
+import { OperatorFunction } from 'rxjs/interfaces'
+import { Clause, ExecutorResult, JoinMode, Predicate, Query, SchemaDef, Transaction, TransactionEffects } from 'reactivedb/interface'
+import { QueryToken as RDBQueryToken, SelectorMeta } from 'reactivedb/proxy'
+
+export * from 'reactivedb/interface'
+export { ProxySelector, SelectorMeta } from 'reactivedb/proxy'
+
+export interface Database {
+  readonly inTransaction: boolean
+
+  defineSchema: <T>(tableName: string, schema: SchemaDef<T>) => this
+  connect: () => void
+  dump: () => Observable<Object>
+  load: (data: any) => Observable<void>
+
+  // 类型重载
+  insert<T>(tableName: string, raw: T[]): Observable<ExecutorResult>
+  insert<T>(tableName: string, raw: T): Observable<ExecutorResult>
+  insert<T>(tableName: string, raw: T | T[]): Observable<ExecutorResult>
+
+  get: <T>(tableName: string, query?: Query<T>, mode?: JoinMode) => QueryToken<T>
+  update: <T>(tableName: string, clause: Predicate<T>, raw: Partial<T>) => Observable<ExecutorResult>
+  delete: <T>(tableName: string, clause?: Predicate<T>) => Observable<ExecutorResult>
+
+  // 类型重载
+  upsert<T>(tableName: string, raw: T): Observable<ExecutorResult>
+  upsert<T>(tableName: string, raw: T[]): Observable<ExecutorResult>
+  upsert<T>(tableName: string, raw: T | T[]): Observable<ExecutorResult>
+
+  remove: <T>(tableName: string, clause?: Clause<T>) => Observable<ExecutorResult>
+  dispose: () => ErrorObservable | Observable<ExecutorResult>
+  attachTx: (effects: TransactionEffects) => void
+  transaction: () => Observable<Transaction<Database>>
+}
+
+export interface QueryToken<T> extends RDBQueryToken<T> {
+  selector$: Observable<SelectorMeta<T>>
+  map: <K>(fn: OperatorFunction<T[], K[]>) => QueryToken<K>
+  values: () => Observable<T[]>
+  changes: () => Observable<T[]>
+  concat: (...tokens: QueryToken<T>[]) => QueryToken<T>
+  combine: (...tokens: QueryToken<any>[]) => QueryToken<T>
+  toString: () => Observable<string>
+}
+
+export function createQueryToken<T>(selector$: Observable<SelectorMeta<T>>): QueryToken<T> {
+  return new RDBQueryToken(selector$)
+}

src/schemas/Activity.ts

@@ -1,4 +1,4 @@
-import { SchemaDef, RDBType, Relationship } from 'reactivedb/interface'
+import { SchemaDef, RDBType, Relationship } from '../db'
 import { schemaColl } from './schemas'
 import { ExecutorOrCreator, ActivityId, DetailObjectTypes, DetailObjectId, UserId } from 'teambition-types'
 

src/schemas/Application.ts

@@ -1,5 +1,5 @@
 import { ApplicationId } from 'teambition-types'
-import { RDBType, SchemaDef } from 'reactivedb/interface'
+import { RDBType, SchemaDef } from '../db'
 import { schemaColl } from './schemas'
 
 export interface ApplicationSchema {

src/schemas/Collection.ts

@@ -1,4 +1,4 @@
-import { SchemaDef, RDBType } from 'reactivedb/interface'
+import { SchemaDef, RDBType } from '../db'
 import { schemaColl } from './schemas'
 import { CollectionId, UserId, VisibleOption, ExecutorOrCreator } from 'teambition-types'
 

src/schemas/CommonGroup.ts

@@ -1,4 +1,4 @@
-import { SchemaDef, RDBType } from 'reactivedb/interface'
+import { SchemaDef, RDBType } from '../db'
 import { schemaColl } from './schemas'
 import { ApplicationId, CommonGroupId, OrganizationId, ProjectId, TesthubId, UserId, TestplanId } from 'teambition-types'
 

src/schemas/CustomField.ts

@@ -1,4 +1,4 @@
-import { SchemaDef, RDBType, Relationship } from 'reactivedb/interface'
+import { SchemaDef, RDBType, Relationship } from '../db'
 import { schemaColl } from './schemas'
 import { CustomFieldType, CustomFieldBoundType, CustomFieldCategoryId, AdvancedCustomField, UserSnippet } from 'teambition-types'
 import { CustomFieldId, OrganizationId, ProjectId, RoleId, UserId, AdvancedCustomFieldId } from 'teambition-types'

src/schemas/CustomFieldCategory.ts

@@ -1,4 +1,4 @@
-import { RDBType, SchemaDef } from 'reactivedb/interface'
+import { RDBType, SchemaDef } from '../db'
 import { CustomFieldCategoryId, UserId, OrganizationId } from 'teambition-types'
 import { schemaColl } from './schemas'
 

src/schemas/CustomFieldLink.ts

@@ -1,4 +1,4 @@
-import { SchemaDef, RDBType, Relationship } from 'reactivedb/interface'
+import { SchemaDef, RDBType, Relationship } from '../db'
 import { schemaColl } from './schemas'
 import { CustomFieldType, CustomFieldBoundType, AdvancedCustomField, CustomFieldSubtype, UserId, UserSnippet } from 'teambition-types'
 import { CustomFieldId, CustomFieldLinkId, ProjectId, RoleId, CustomFieldCategoryId } from 'teambition-types'

src/schemas/CustomRole.ts

@@ -1,4 +1,4 @@
-import { SchemaDef, RDBType } from 'reactivedb/interface'
+import { SchemaDef, RDBType } from '../db'
 import { schemaColl } from './schemas'
 import { CustomRoleId, CustomRoleType, OrganizationId, UserId } from 'teambition-types'
 

src/schemas/DefaultRole.ts

@@ -1,4 +1,4 @@
-import { SchemaDef, RDBType } from 'reactivedb/interface'
+import { SchemaDef, RDBType } from '../db'
 import { schemaColl } from './schemas'
 import { DefaultRoleId } from 'teambition-types'
 

src/schemas/Event.ts

@@ -1,4 +1,4 @@
-import { SchemaDef, RDBType, Relationship } from 'reactivedb/interface'
+import { SchemaDef, RDBType, Relationship } from '../db'
 import { schemaColl } from './schemas'
 import {
   VisibleOption,

src/schemas/File.ts

@@ -1,4 +1,4 @@
-import { SchemaDef, Relationship, RDBType } from 'reactivedb/interface'
+import { SchemaDef, Relationship, RDBType } from '../db'
 import { schemaColl } from './schemas'
 import { ObjectLinkSchema } from './ObjectLink'
 import {

src/schemas/Group.ts

@@ -1,4 +1,4 @@
-import { SchemaDef, RDBType, Relationship } from 'reactivedb/interface'
+import { SchemaDef, RDBType, Relationship } from '../db'
 import { schemaColl } from './schemas'
 import {
   GroupId,

src/schemas/HomeActivity.ts

@@ -1,4 +1,4 @@
-import { SchemaDef, RDBType } from 'reactivedb/interface'
+import { SchemaDef, RDBType } from '../db'
 import { schemaColl } from './schemas'
 import { ApplicationSchema } from './Application'
 import { CollectionSchema } from './Collection'

src/schemas/Like.ts

@@ -1,4 +1,4 @@
-import { SchemaDef, RDBType } from 'reactivedb/interface'
+import { SchemaDef, RDBType } from '../db'
 import { schemaColl } from './schemas'
 import { ExecutorOrCreator } from 'teambition-types'
 

src/schemas/Member.ts

@@ -1,4 +1,4 @@
-import { SchemaDef, RDBType } from 'reactivedb/interface'
+import { SchemaDef, RDBType } from '../db'
 import { MemberId, OrganizationId, ProjectId, RoleId, TeamId, UserId } from 'teambition-types'
 import { ProjectSchema } from './Project'
 import { schemaColl } from './schemas'

src/schemas/Message.ts

@@ -1,4 +1,4 @@
-import { SchemaDef, RDBType } from 'reactivedb/interface'
+import { SchemaDef, RDBType } from '../db'
 import { schemaColl } from './schemas'
 import {
   MessageId,

src/schemas/ObjectLink.ts

@@ -1,4 +1,4 @@
-import { SchemaDef, Relationship, RDBType } from 'reactivedb/interface'
+import { SchemaDef, Relationship, RDBType } from '../db'
 import { schemaColl } from './schemas'
 import {
   ExecutorOrCreator,

src/schemas/Organization.ts

@@ -1,4 +1,4 @@
-import { SchemaDef, RDBType } from 'reactivedb/interface'
+import { SchemaDef, RDBType } from '../db'
 import { OrganizationId, ProjectId, RoleId, UserId, CollectionId, ExecutorOrCreator } from 'teambition-types'
 
 import { Role } from './CustomRole'

src/schemas/Post.ts

@@ -6,7 +6,7 @@ import {
   ProjectId,
   VisibleOption
 } from 'teambition-types'
-import { SchemaDef, RDBType, Relationship } from 'reactivedb/interface'
+import { SchemaDef, RDBType, Relationship } from '../db'
 import { schemaColl } from './schemas'
 import { FileSchema } from './File'
 

src/schemas/Preference.ts

@@ -7,7 +7,7 @@ import {
   OrganizationId,
   ProjectPortalMode
 } from 'teambition-types'
-import { RDBType, SchemaDef } from 'reactivedb/interface'
+import { RDBType, SchemaDef } from '../db'
 import { schemaColl } from './schemas'
 
 export interface PreferenceTipMap {

src/schemas/Project.ts

@@ -1,4 +1,4 @@
-import { RDBType, SchemaDef, Relationship } from 'reactivedb/interface'
+import { RDBType, SchemaDef, Relationship } from '../db'
 import { CustomFieldValue, ExecutorOrCreator, TaskSortMethod, UserSnippet, PermissionBinding, TasklistId } from 'teambition-types'
 import { ProjectId, UserId, OrganizationId, RoleId, CollectionId, ApplicationId } from 'teambition-types'
 import { schemaColl } from './schemas'

src/schemas/ProjectStatusActivity.ts

@@ -1,4 +1,4 @@
-import { SchemaDef, RDBType } from 'reactivedb/interface'
+import { SchemaDef, RDBType } from '../db'
 import { schemaColl } from './schemas'
 import { ProjectStatusActivityId, ProjectStatusDegree, UserSnippet } from 'teambition-types'
 

src/schemas/ProjectTag.ts

@@ -1,4 +1,4 @@
-import { SchemaDef, RDBType } from 'reactivedb/interface'
+import { SchemaDef, RDBType } from '../db'
 import { schemaColl } from './schemas'
 import { OrganizationId, ProjectId, ProjectTagId, UserId, PermissionBinding, ProjectTagVisibleOption } from 'teambition-types'
 

src/schemas/Room.ts

@@ -1,4 +1,4 @@
-import { SchemaDef, Relationship, RDBType } from 'reactivedb/interface'
+import { SchemaDef, Relationship, RDBType } from '../db'
 import { schemaColl } from './schemas'
 import {
   RoomId,

src/schemas/ScenarioFieldConfig.ts

@@ -1,4 +1,4 @@
-import { SchemaDef, RDBType, Relationship } from 'reactivedb/interface'
+import { SchemaDef, RDBType, Relationship } from '../db'
 import { schemaColl } from './schemas'
 import {
   EventScenarioFieldIcon,

src/schemas/SmartGroup.ts

@@ -1,4 +1,4 @@
-import { RDBType, SchemaDef } from 'reactivedb/interface'
+import { RDBType, SchemaDef } from '../db'
 import {
   BoardAxisType,
   ProjectId,

src/schemas/Sprint.ts

@@ -1,4 +1,4 @@
-import { RDBType, SchemaDef } from 'reactivedb/interface'
+import { RDBType, SchemaDef } from '../db'
 import { SprintId, ProjectId, UserId } from 'teambition-types'
 import { schemaColl } from './schemas'
 

src/schemas/Stage.ts

@@ -1,4 +1,4 @@
-import { SchemaDef, RDBType } from 'reactivedb/interface'
+import { SchemaDef, RDBType } from '../db'
 import { schemaColl } from './schemas'
 import { StageId, ProjectId, TasklistId, UserId } from 'teambition-types'
 

src/schemas/Subtask.ts

@@ -1,4 +1,4 @@
-import { SchemaDef, RDBType, Relationship } from 'reactivedb/interface'
+import { SchemaDef, RDBType, Relationship } from '../db'
 import { schemaColl } from './schemas'
 import {
   ExecutorOrCreator,

src/schemas/Tag.ts

@@ -1,5 +1,5 @@
-import { RDBType } from 'reactivedb/interface'
-import { SchemaDef } from 'reactivedb/interface'
+import { RDBType } from '../db'
+import { SchemaDef } from '../db'
 import { TagId, UserId, ProjectId, DefaultColors, OrganizationId, TagCategoryId } from 'teambition-types'
 import { schemaColl } from './schemas'