Skip to content

Commit 250fb56

Browse files
ViatorusViatorus
committed
Rebase again.
1 parent 2a69553 commit 250fb56

File tree

13 files changed

+58
-57
lines changed

13 files changed

+58
-57
lines changed

‎config/nycrc.node.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
"exclude": [
1010
"**/*.helper.[jt]s",
1111
"**/*.spec.[jt]s",
12-
"**/spec/**/*.[jt]s"
12+
"**/spec/**/*.[jt]s",
13+
"**/lokijs/**/*.js"
1314
],
1415
"report-dir": "./coverage/node/"
1516
}

‎packages/common/types.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/**
22
* @hidden
33
*/
4-
import {Loki} from "../loki/src";
5-
import {Serialization} from "../loki/src/serialization/migration";
4+
import { Loki } from "../loki/src";
5+
import { Serialization } from "../loki/src/serialization/migration";
66

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

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

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
import {InvertedIndex} from "./inverted_index";
2-
import {IndexSearcher} from "./index_searcher";
3-
import {Dict} from "../../common/types";
4-
import {PLUGINS} from "../../common/plugin";
5-
import {Query} from "./query_types";
6-
import {Scorer} from "./scorer";
7-
import {Analyzer} from "./analyzer/analyzer";
8-
import {Serialization} from "../../loki/src/serialization/migration";
1+
import { InvertedIndex } from "./inverted_index";
2+
import { IndexSearcher } from "./index_searcher";
3+
import { Dict } from "../../common/types";
4+
import { PLUGINS } from "../../common/plugin";
5+
import { Query } from "./query_types";
6+
import { Scorer } from "./scorer";
7+
import { Analyzer } from "./analyzer/analyzer";
8+
import { Serialization } from "../../loki/src/serialization/migration";
99

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

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import {Analyzer, StandardAnalyzer, analyze} from "./analyzer/analyzer";
2-
import {Serialization} from "../../loki/src/serialization/migration";
1+
import { Analyzer, StandardAnalyzer, analyze } from "./analyzer/analyzer";
2+
import { Serialization } from "../../loki/src/serialization/migration";
33

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

‎packages/loki/spec/generic/migration.spec.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import {Loki} from "../../src/loki";
2-
import {Serialization, mergeRightBiasedWithProxy} from "../../src/serialization/migration";
1+
import { Loki } from "../../src/loki";
2+
import { Serialization, mergeRightBiasedWithProxy } from "../../src/serialization/migration";
33

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

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* global describe, it, expect */
2-
import {Loki} from "../../src/loki";
3-
import {Doc} from "../../../common/types";
4-
import {Serialization} from "../../src/serialization/migration";
2+
import { Loki } from "../../src/loki";
3+
import { Doc } from "../../../common/types";
4+
import { Serialization } from "../../src/serialization/migration";
55

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

‎packages/loki/src/collection.ts

+11-11
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
import {LokiEventEmitter} from "./event_emitter";
2-
import {UniqueIndex} from "./unique_index";
3-
import {ResultSet, LokiOps} from "./result_set";
4-
import {DynamicView} from "./dynamic_view";
5-
import {ltHelper, gtHelper, aeqHelper} from "./helper";
6-
import {clone, CloneMethod} from "./clone";
7-
import {Doc, Dict} from "../../common/types";
8-
import {FullTextSearch} from "../../full-text-search/src/full_text_search";
9-
import {PLUGINS} from "../../common/plugin";
10-
import {Analyzer} from "../../full-text-search/src/analyzer/analyzer";
11-
import {Serialization} from "./serialization/migration";
1+
import { LokiEventEmitter } from "./event_emitter";
2+
import { UniqueIndex } from "./unique_index";
3+
import { ResultSet, LokiOps } from "./result_set";
4+
import { DynamicView } from "./dynamic_view";
5+
import { ltHelper, gtHelper, aeqHelper } from "./helper";
6+
import { clone, CloneMethod } from "./clone";
7+
import { Doc, Dict } from "../../common/types";
8+
import { FullTextSearch } from "../../full-text-search/src/full_text_search";
9+
import { PLUGINS } from "../../common/plugin";
10+
import { Analyzer } from "../../full-text-search/src/analyzer/analyzer";
11+
import { Serialization } from "./serialization/migration";
1212

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

‎packages/loki/src/dynamic_view.ts

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
import {LokiEventEmitter} from "./event_emitter";
2-
import {ResultSet} from "./result_set";
3-
import {Collection} from "./collection";
4-
import {Doc} from "../../common/types";
5-
import {Scorer} from "../../full-text-search/src/scorer";
6-
import {Serialization} from "./serialization/migration";
1+
import { LokiEventEmitter } from "./event_emitter";
2+
import { ResultSet } from "./result_set";
3+
import { Collection } from "./collection";
4+
import { Doc } from "../../common/types";
5+
import { Scorer } from "../../full-text-search/src/scorer";
6+
import { Serialization } from "./serialization/migration";
77

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

‎packages/loki/src/loki.ts

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
/* global global */
2-
import {LokiEventEmitter} from "./event_emitter";
3-
import {Collection} from "./collection";
4-
import {clone} from "./clone";
5-
import {Doc, StorageAdapter} from "../../common/types";
6-
import {PLUGINS} from "../../common/plugin";
7-
import {Serialization, migrateDatabase} from "./serialization/migration";
2+
import { LokiEventEmitter } from "./event_emitter";
3+
import { Collection } from "./collection";
4+
import { clone } from "./clone";
5+
import { Doc, StorageAdapter } from "../../common/types";
6+
import { PLUGINS } from "../../common/plugin";
7+
import { Serialization, migrateDatabase } from "./serialization/migration";
88

99
function getENV(): Loki.Environment {
1010
if (global !== undefined && (global["android"] || global["NSObject"])) {

‎packages/loki/src/result_set.ts

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
import {Collection} from "./collection";
2-
import {clone, CloneMethod} from "./clone";
3-
import {ltHelper, gtHelper, aeqHelper, sortHelper} from "./helper";
4-
import {Doc} from "../../common/types";
5-
import {Scorer} from "../../full-text-search/src/scorer";
6-
import {Query as FullTextSearchQuery} from "../../full-text-search/src/query_types";
7-
import {Serialization} from "./serialization/migration";
1+
import { Collection } from "./collection";
2+
import { clone, CloneMethod } from "./clone";
3+
import { ltHelper, gtHelper, aeqHelper, sortHelper } from "./helper";
4+
import { Doc } from "../../common/types";
5+
import { Scorer } from "../../full-text-search/src/scorer";
6+
import {Query as FullTextSearchQuery } from "../../full-text-search/src/query_types";
7+
import { Serialization } from "./serialization/migration";
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/migration.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import {V2_0, V2_0 as Serialization} from "./v2_0";
2-
import {V1_5} from "./v1_5";
3-
import {Dict} from "../../../common/types";
1+
import { V2_0, V2_0 as Serialization } from "./v2_0";
2+
import { V1_5 } from "./v1_5";
3+
import { Dict } from "../../../common/types";
44

55
export {Serialization};
66

‎packages/loki/src/serialization/v1_5.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {Dict} from "../../../common/types";
1+
import { Dict } from "../../../common/types";
22

33
export namespace V1_5 {
44

@@ -68,7 +68,7 @@ export namespace V1_5 {
6868
dataOptions?: ResultSet.DataOptions;
6969
} | {
7070
type: "mapReduce";
71-
mapFunction: 2,//(item: Doc<object>, index: number, array: Doc<object>[]) => any;
71+
mapFunction: 2, //(item: Doc<object>, index: number, array: Doc<object>[]) => any;
7272
reduceFunction: (array: any[]) => any;
7373
} | {
7474
type: "update";

‎packages/loki/src/serialization/v2_0.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {Dict} from "../../../common/types";
1+
import { Dict } from "../../../common/types";
22

33
export namespace V2_0 {
44

@@ -212,9 +212,9 @@ export namespace V2_0 {
212212

213213
export type Query =
214214
{ [P: string]: LokiOps | any }
215-
& { $and?: Query[] }
216-
& { $or?: Query[] }
217-
& { $fts?: FullTextSearch.Query };
215+
| { $and?: Query[] }
216+
| { $or?: Query[] }
217+
| { $fts?: FullTextSearch.Query };
218218

219219
export interface FullTextSearch {
220220
id: string;

0 commit comments

Comments
 (0)