Rename loader to migrate.

LokiJS-Forge · Jun 5, 2018 · 70f374c · 70f374c
1 parent cb7c7d7
commit 70f374c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/packages/loki/spec/generic/migration.spec.ts b/packages/loki/spec/generic/migration.spec.ts
@@ -228,7 +228,7 @@ describe("load lokijs", () => {
   it("test LokiDB with serialization inflation", () => {
     let db = new Loki();
     db.loadJSONObject(legacyDB as Serialization.Serialized, {
-      loader: (_1, coll) => {
+      migrate: (_1, coll) => {
         coll.nestedProperties = [{name: "d.msg", path: ["d", "msg"]}];
         return false;
       }
@@ -258,7 +258,7 @@ describe("load lokijs", () => {
 
     // Transform and dynamic view will not be deserialized.
     db.loadJSONObject(legacyDB as Serialization.Serialized, {
-      loader: (_1, _2, options) => {
+      migrate: (_1, _2, options) => {
         options.nestedProperties = ["d.msg"];
         return true;
       }

diff --git a/packages/loki/src/collection.ts b/packages/loki/src/collection.ts
@@ -2186,7 +2186,7 @@ export namespace Collection {
   export interface DeserializeOptions {
     retainDirtyFlags?: boolean;
     fullTextSearch?: Dict<Analyzer>;
-    loader?: (databaseVersion: number, coll: Serialization.Collection, options: Collection.Options<any, any>) => boolean;
+    migrate?: (databaseVersion: number, coll: Serialization.Collection, options: Collection.Options<any, any>) => boolean;
 
     [collName: string]: any | { proto?: any; inflate?: (src: object, dest?: object) => void };
   }

diff --git a/packages/loki/src/loki.ts b/packages/loki/src/loki.ts
@@ -676,7 +676,7 @@ export class Loki extends LokiEventEmitter {
       let coll = null;
       const dbColl = dbObj.collections[i];
 
-      if (options.loader) {
+      if (options.migrate) {
         // Generate options from serialized collection.
         const collOptions: Collection.Options<any, any> = {};
 
@@ -704,7 +704,7 @@ export class Loki extends LokiEventEmitter {
           }
         }
 
-        if (options.loader(databaseVersion, dbColl, collOptions)) {
+        if (options.migrate(databaseVersion, dbColl, collOptions)) {
           coll = this.addCollection(dbColl.name, collOptions);
           for (let j = 0; j < dbColl.data.length; j++) {
             delete dbColl.data[j].$loki;
@@ -716,8 +716,7 @@ export class Loki extends LokiEventEmitter {
       if (!coll) {
         coll = Collection.fromJSONObject(dbObj.collections[i], options);
       }
-
-      this._collections.push(Collection.fromJSONObject(dbObj.collections[i], options));
+      this._collections.push(coll);
     }
   }