replaced zen-observable to zer-observable-ts

nebkat · Jan 18, 2021 · 28688b8 · 28688b8
1 parent 95782ee
commit 28688b8
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 18 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "typeorm",
   "private": true,
-  "version": "0.3.0-rc.20",
+  "version": "0.3.0-rc.21",
   "description": "Data-Mapper ORM for TypeScript, ES7, ES6, ES5. Supports MySQL, PostgreSQL, MariaDB, SQLite, MS SQL Server, Oracle, MongoDB databases.",
   "license": "MIT",
   "readmeFilename": "README.md",
@@ -67,7 +67,6 @@
     "@types/source-map-support": "^0.5.1",
     "@types/xml2js": "^0.4.5",
     "@types/yargs": "^15.0.4",
-    "@types/zen-observable": "^0.8.0",
     "@typescript-eslint/eslint-plugin": "^4.1.0",
     "@typescript-eslint/parser": "^4.1.0",
     "better-sqlite3": "^7.1.0",
@@ -126,7 +125,7 @@
     "xml2js": "^0.4.23",
     "yargonaut": "^1.1.2",
     "yargs": "^16.0.3",
-    "zen-observable": "^0.8.15"
+    "zen-observable-ts": "^0.8.21"
   },
   "lint-staged": {
     "*.ts": [

diff --git a/src/entity-manager/EntityManager.ts b/src/entity-manager/EntityManager.ts
@@ -16,7 +16,7 @@ import {UpdateResult} from "../query-builder/result/UpdateResult";
 import {DeleteResult} from "../query-builder/result/DeleteResult";
 import {IsolationLevel} from "../driver/types/IsolationLevel";
 import {FindExtraOptions, FindOptions, FindOptionsWhere} from "../find-options/FindOptions";
-import * as Observable from "zen-observable";
+import { Observable } from "zen-observable-ts";
 
 /**
  * Entity manager supposed to work with any entity, automatically find its repository and call its methods,

diff --git a/src/entity-manager/LiteralEntityManager.ts b/src/entity-manager/LiteralEntityManager.ts
@@ -32,7 +32,7 @@ import {Repository} from "../repository/Repository";
 import {SaveOptions} from "../repository/SaveOptions";
 import {TreeRepository} from "../repository/TreeRepository";
 import {ObjectUtils} from "../util/ObjectUtils";
-import * as Observable from "zen-observable";
+import { Observable } from "zen-observable-ts";
 import {createLiteralTreeRepository} from "../repository/LiteralTreeRepository";
 import {EntityTarget} from "../common/EntityTarget";
 import {createLiteralMongoRepository} from "../repository/LiteralMongoRepository";

diff --git a/src/index.ts b/src/index.ts
@@ -1,7 +1,7 @@
 /*!
  */
 import "reflect-metadata";
-import "zen-observable";
+import "zen-observable-ts";
 import {ConnectionManager} from "./connection/ConnectionManager";
 import {Connection} from "./connection/Connection";
 import {MetadataArgsStorage} from "./metadata-args/MetadataArgsStorage";

diff --git a/src/observer/QueryObserver.ts b/src/observer/QueryObserver.ts
@@ -9,7 +9,8 @@ import {
     UpdateEvent,
     EntityTarget
 } from "../index";
-import Observable from "zen-observable";
+import { Observable, ZenObservable } from "zen-observable-ts";
+import SubscriptionObserver = ZenObservable.SubscriptionObserver;
 
 // todo: we probably need operation-level subscribers
 // todo: right now if we save 1000 entities within a single save call its going to call this code 1000 times
@@ -37,7 +38,7 @@ export class QueryObserver {
     public lastEmitEntities: ObjectLiteral[] = [];
     public lastEmitEntity: ObjectLiteral|undefined;
     public lastEmitCount: number;
-    public subscriptionObserver: ZenObservable.SubscriptionObserver<any>;
+    public subscriptionObserver: SubscriptionObserver<any>;
 
     // -------------------------------------------------------------------------
     // Constructor

diff --git a/src/repository/BaseEntity.ts b/src/repository/BaseEntity.ts
@@ -12,7 +12,7 @@ import {DeleteResult} from "../query-builder/result/DeleteResult";
 import {ObjectID} from "../driver/mongodb/typings";
 import {ObjectUtils} from "../util/ObjectUtils";
 import {QueryDeepPartialEntity} from "../query-builder/QueryPartialEntity";
-import * as Observable from "zen-observable";
+import { Observable } from "zen-observable-ts";
 
 /**
  * Base abstract entity for all entities, used in ActiveRecord patterns.

diff --git a/src/repository/LiteralRepository.ts b/src/repository/LiteralRepository.ts
@@ -9,7 +9,7 @@ import {SelectQueryBuilder} from "../query-builder/SelectQueryBuilder";
 import {QueryRunner} from "../query-runner/QueryRunner";
 import {RemoveOptions} from "./RemoveOptions";
 import {SaveOptions} from "./SaveOptions";
-import * as Observable from "zen-observable";
+import { Observable } from "zen-observable-ts";
 import {Repository} from "./Repository";
 import {EntityManager} from "..";
 import {EntityTarget} from "../common/EntityTarget";

diff --git a/src/repository/Repository.ts b/src/repository/Repository.ts
@@ -12,7 +12,7 @@ import {UpdateResult} from "../query-builder/result/UpdateResult";
 import {InsertResult} from "../query-builder/result/InsertResult";
 import {QueryDeepPartialEntity} from "../query-builder/QueryPartialEntity";
 import {ObjectID} from "../driver/mongodb/typings";
-import * as Observable from "zen-observable";
+import { Observable } from "zen-observable-ts";
 
 /**
  * Repository is supposed to work with your entity objects. Find entities, insert, update, delete, etc.