Skip to content

Commit 41d0506

Browse files
committed
Rename serialization to migration.
1 parent 5d9ab5c commit 41d0506

File tree

10 files changed

+20
-20
lines changed

10 files changed

+20
-20
lines changed

packages/common/types.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* @hidden
33
*/
44
import {Loki} from "../loki/src";
5-
import {Serialization} from "../loki/src/serialization/serialization";
5+
import {Serialization} from "../loki/src/serialization/migrate";
66

77
export interface StorageAdapter {
88
loadDatabase(dbname: string): Promise<string | Loki | Serialization.Serialized>;

packages/full-text-search/src/full_text_search.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import {PLUGINS} from "../../common/plugin";
55
import {Query} from "./query_types";
66
import {Scorer} from "./scorer";
77
import {Analyzer} from "./analyzer/analyzer";
8-
import {Serialization} from "../../loki/src/serialization/serialization";
8+
import {Serialization} from "../../loki/src/serialization/migrate";
99

1010
export class FullTextSearch {
1111
/// The id field of each document.

packages/full-text-search/src/inverted_index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {Analyzer, StandardAnalyzer, analyze} from "./analyzer/analyzer";
2-
import {Serialization} from "../../loki/src/serialization/serialization";
2+
import {Serialization} from "../../loki/src/serialization/migrate";
33

44
/**
55
* Converts a string into an array of code points.

packages/loki/spec/generic/serialization.spec.ts renamed to packages/loki/spec/generic/migration.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {Loki} from "../../src/loki";
2-
import {Serialization, mergeRightBiasedWithProxy} from "../../src/serialization/serialization";
2+
import {Serialization, mergeRightBiasedWithProxy} from "../../src/serialization/migrate";
33

44
declare var require: (moduleId: string) => any;
55
const loki = require("../../../lokijs/lokijs.js");

packages/loki/spec/generic/typed.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* global describe, it, expect */
22
import {Loki} from "../../src/loki";
33
import {Doc} from "../../../common/types";
4-
import {Serialization} from "../../src/serialization/serialization";
4+
import {Serialization} from "../../src/serialization/migrate";
55

66
describe("typed", () => {
77
it("works", () => {

packages/loki/src/collection.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import {Doc, Dict} from "../../common/types";
88
import {FullTextSearch} from "../../full-text-search/src/full_text_search";
99
import {PLUGINS} from "../../common/plugin";
1010
import {Analyzer} from "../../full-text-search/src/analyzer/analyzer";
11-
import {Serialization} from "./serialization/serialization";
11+
import {Serialization} from "./serialization/migrate";
1212

1313
export {CloneMethod} from "./clone";
1414

packages/loki/src/dynamic_view.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import {ResultSet} from "./result_set";
33
import {Collection} from "./collection";
44
import {Doc} from "../../common/types";
55
import {Scorer} from "../../full-text-search/src/scorer";
6-
import {Serialization} from "./serialization/serialization";
6+
import {Serialization} from "./serialization/migrate";
77

88
/**
99
* DynamicView class is a versatile 'live' view class which can have filters and sorts applied.

packages/loki/src/loki.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import {Collection} from "./collection";
44
import {clone} from "./clone";
55
import {Doc, StorageAdapter} from "../../common/types";
66
import {PLUGINS} from "../../common/plugin";
7-
import {Serialization, deserializeLegacyDB} from "./serialization/serialization";
7+
import {Serialization, migrateDatabase} from "./serialization/migrate";
88

99
function getENV(): Loki.Environment {
1010
if (global !== undefined && (global["android"] || global["NSObject"])) {
@@ -49,7 +49,7 @@ export class Loki extends LokiEventEmitter {
4949
// currently keeping persistenceMethod and persistenceAdapter as loki level properties that
5050
// will not or cannot be deserialized You are required to configure persistence every time
5151
// you instantiate a loki object (or use default environment detection) in order to load the database anyways.
52-
private _serializationMethod: Loki.SerializedMethod;
52+
private _serializationMethod: Loki.SerializationMethod;
5353
private _destructureDelimiter: string;
5454
// persistenceMethod could be 'fs', 'localStorage', or 'adapter'
5555
// this is optional option param, otherwise environment detection will be used
@@ -74,7 +74,7 @@ export class Loki extends LokiEventEmitter {
7474
* @param {string} filename - name of the file to be saved to
7575
* @param {object} [options={}] - options
7676
* @param {Loki.Environment} [options.env] - the javascript environment
77-
* @param {Loki.SerializedMethod} [options.serializationMethod=NORMAL] - the serialization method
77+
* @param {Loki.SerializationMethod} [options.serializationMethod=NORMAL] - the serialization method
7878
* @param {string} [options.destructureDelimiter="$<\n"] - string delimiter used for destructured serialization
7979
*/
8080
constructor(filename = "loki.db", options: Loki.Options = {}) {
@@ -666,7 +666,7 @@ export class Loki extends LokiEventEmitter {
666666
public loadJSONObject(obj: Serialization.Serialized, options: Collection.DeserializeOptions = {}): void {
667667

668668
const databaseVersion = obj.databaseVersion;
669-
const dbObj = deserializeLegacyDB(obj);
669+
const dbObj = migrateDatabase(obj);
670670

671671
const len = dbObj.collections ? dbObj.collections.length : 0;
672672
this.filename = dbObj.filename;
@@ -1045,7 +1045,7 @@ export class Loki extends LokiEventEmitter {
10451045
export namespace Loki {
10461046
export interface Options {
10471047
env?: Environment;
1048-
serializationMethod?: SerializedMethod;
1048+
serializationMethod?: SerializationMethod;
10491049
destructureDelimiter?: string;
10501050
}
10511051

@@ -1064,7 +1064,7 @@ export namespace Loki {
10641064
}
10651065

10661066
export interface SerializeOptions {
1067-
serializationMethod?: SerializedMethod;
1067+
serializationMethod?: SerializationMethod;
10681068
}
10691069

10701070
export interface SerializeDestructuredOptions {
@@ -1089,7 +1089,7 @@ export namespace Loki {
10891089

10901090
export type LoadDatabaseOptions = Collection.DeserializeOptions & ThrottledDrainOptions;
10911091

1092-
export type SerializedMethod = "normal" | "pretty" | "destructured";
1092+
export type SerializationMethod = "normal" | "pretty" | "destructured";
10931093

10941094
export type PersistenceMethod = "fs-storage" | "local-storage" | "indexed-storage" | "memory-storage" | "adapter";
10951095

packages/loki/src/result_set.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import {ltHelper, gtHelper, aeqHelper, sortHelper} from "./helper";
44
import {Doc} from "../../common/types";
55
import {Scorer} from "../../full-text-search/src/scorer";
66
import {Query as FullTextSearchQuery} from "../../full-text-search/src/query_types";
7-
import {Serialization} from "./serialization/serialization";
7+
import {Serialization} from "./serialization/migrate";
88

99
// used to recursively scan hierarchical transform step object for param substitution
1010
function resolveTransformObject<TData extends object, TNested extends object>(subObj: Collection.Transform<TData, TNested>, params: object, depth: number = 0): Collection.Transform<TData, TNested> {

packages/loki/src/serialization/serialization.ts renamed to packages/loki/src/serialization/migrate.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,9 @@ export function mergeRightBiasedWithProxy<TLeft, TRight>(left: TLeft, right: TRi
5757
) as any;
5858
}
5959

60-
function convertV1_5toV2_0(obj: V1_5.Loki): V2_0.Loki {
60+
function migrateV1_5toV2_0(obj: V1_5.Loki): V2_0.Loki {
6161

62-
function convertCloneMethod(clone: V1_5.CloneMethod): V2_0.CloneMethod {
62+
function migrateCloneMethod(clone: V1_5.CloneMethod): V2_0.CloneMethod {
6363
switch (clone) {
6464
case "jquery-extend-deep":
6565
return "deep";
@@ -89,7 +89,7 @@ function convertV1_5toV2_0(obj: V1_5.Loki): V2_0.Loki {
8989
field: dv.sortCriteriaSimple.propname
9090
},
9191
})),
92-
cloneMethod: convertCloneMethod(coll.cloneMethod),
92+
cloneMethod: migrateCloneMethod(coll.cloneMethod),
9393
transforms: coll.transforms as any as Dict<V2_0.Transform[]>, // TODO not accurate
9494
nestedProperties: [],
9595
ttl: undefined,
@@ -99,9 +99,9 @@ function convertV1_5toV2_0(obj: V1_5.Loki): V2_0.Loki {
9999
});
100100
}
101101

102-
export function deserializeLegacyDB(obj: Serialization.Serialized): Serialization.Loki {
102+
export function migrateDatabase(obj: Serialization.Serialized): Serialization.Loki {
103103
if (obj.databaseVersion === 1.5) {
104-
return deserializeLegacyDB(convertV1_5toV2_0(obj as V1_5.Loki));
104+
return migrateDatabase(migrateV1_5toV2_0(obj as V1_5.Loki));
105105
}
106106
return obj as Serialization.Loki;
107107
}

0 commit comments

Comments
 (0)