diff --git a/CHANGELOG.md b/CHANGELOG.md index 051c000..2af7253 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,13 @@ This project does its best to adhere to [Semantic Versioning](http://semver.org/ -------- -### [0.12.2](N/A) - 2016-05-25 +### [0.12.3](N/A) - 2016-05-26 +#### Changed +* Changed to work with latest version of ts-mortar and new ts-typed-promises library + + +-------- +### [0.12.2](https://github.com/TeamworkGuy2/lokijs-collections/commit/03c4bb6bb3c9f517d1d97fd0a21750735564bcca) - 2016-05-25 #### changed * Replaced two console.error() calls with throw new Error() diff --git a/db-collections/in-mem-collections.d.ts b/db-collections/in-mem-collections.d.ts index 8fd4103..43bb882 100644 --- a/db-collections/in-mem-collections.d.ts +++ b/db-collections/in-mem-collections.d.ts @@ -1,7 +1,7 @@ /// /// /// -/// +/// /// /// /// diff --git a/package.json b/package.json index 4343526..14c3abe 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "lokijs-collections", - "version": "0.12.2", + "version": "0.12.3", "description": "Strongly typed TypeScript collections for [LokiJS] (https://github.com/techfort/LokiJS), including key constraints (i.e. primary keys, non-null fields, max length strings), and collection change trackers.", "dependencies": { "lokijs": "~1.2.0", diff --git a/sync/SyncDataCollection.js b/sync/SyncDataCollection.js index ab4a8e0..53cc9f8 100644 --- a/sync/SyncDataCollection.js +++ b/sync/SyncDataCollection.js @@ -1,6 +1,6 @@ "use strict"; var Arrays = require("../../ts-mortar/utils/Arrays"); -var Defer = require("../../ts-promise-tasks/promises/Defer"); +var Defer = require("../../ts-typed-promises/promises/Defer"); /** Combines functionality for two operations in one class: * - Sync a local data collection to a remote data collection (refered to as 'syncing up'). * - Sync a remote data collection to a local data collection (refered to as 'syncing down'). diff --git a/sync/SyncDataCollection.ts b/sync/SyncDataCollection.ts index 1b0b8fb..e620763 100644 --- a/sync/SyncDataCollection.ts +++ b/sync/SyncDataCollection.ts @@ -1,5 +1,5 @@ import Arrays = require("../../ts-mortar/utils/Arrays"); -import Defer = require("../../ts-promise-tasks/promises/Defer"); +import Defer = require("../../ts-typed-promises/promises/Defer"); /** Combines functionality for two operations in one class: * - Sync a local data collection to a remote data collection (refered to as 'syncing up').