Update type def.

guiyunbao · Aug 9, 2023 · eea27a3 · eea27a3
1 parent 571d129
commit eea27a3
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 17 deletions.
diff --git a/src/Mongodb/Mongodb.ts b/src/Mongodb/Mongodb.ts
@@ -31,7 +31,7 @@ export class MongoDB extends TestDatabase {
  }
 
  // Chunked insert to avoid OOM
- async create(data: TestData[]): Promise<void> {
+ async create(data: Array<TestData>): Promise<void> {
  const chunkSize = 100000;
  const docs = data.map(transformTestData);
  let index = 0;
@@ -73,7 +73,7 @@ export class MongoDB extends TestDatabase {
  lng: Longitude,
  lat: Latitude,
  maxDistance: number
- ): Promise<TestData[]> {
+ ): Promise<Array<TestData>> {
  const locations = await LocationModel.find(
  {
  location: {
@@ -98,7 +98,7 @@ export class MongoDB extends TestDatabase {
  lng: Longitude,
  lat: Latitude,
  maxDistance: number
- ): Promise<TestData[]> {
+ ): Promise<Array<TestData>> {
  const locations = await LocationModel.find(
  {
  location: {

diff --git a/src/Mongodb/Transformer.ts b/src/Mongodb/Transformer.ts
@@ -6,7 +6,7 @@ export function transformTestData(data: TestData): Location {
  id: data.id,
  location: {
  type: "Point",
- coordinates: [data.lng, data.lat],
+ coordinates: [+data.lng, +data.lat],
  },
  };
 }

diff --git a/src/Redis/Redis.ts b/src/Redis/Redis.ts
@@ -4,7 +4,7 @@ import { TestDatabase } from "../TestDatabase";
 import { transformLocation, transformTestData } from "./Transformer";
 import { Latitude, Longitude } from "../utils";
 import { Repository } from "redis-om";
-import { locationSchema } from "./Locations";
+import { locationSchema, Location } from "./Locations";
 
 export class Redis extends TestDatabase {
  redis: any;
@@ -35,7 +35,7 @@ export class Redis extends TestDatabase {
  await this.redis.flushAll();
  }
 
- async create(data: TestData[]): Promise<void> {
+ async create(data: Array<TestData>): Promise<void> {
  const docs = data.map(transformTestData);
  let index = 0;
  while (index < docs.length) {
@@ -62,7 +62,7 @@ export class Redis extends TestDatabase {
  )
  .return.first();
  return transformLocation(
- (location! as any) ?? {
+ (location! as unknown as Location) ?? {
  id: `Out_Of_Range(${closestLimit}km)`,
  location: {
  longitude: 0,
@@ -76,29 +76,29 @@ export class Redis extends TestDatabase {
  lng: Longitude,
  lat: Latitude,
  maxDistance: number
- ): Promise<TestData[]> {
+ ): Promise<Array<TestData>> {
  const locations = await this.repository!.search()
  .where("location")
  .inRadius(
  (circle) =>
  circle.longitude(lng).latitude(lat).radius(maxDistance).kilometers
  )
  .return.first();
- return (locations as any).map(transformLocation);
+ return (locations as unknown as Array<Location>).map(transformLocation);
  }
 
  async queryC(
  lng: Longitude,
  lat: Latitude,
  maxDistance: number
- ): Promise<TestData[]> {
+ ): Promise<Array<TestData>> {
  const locations = await this.repository!.search()
  .where("location")
  .inRadius(
  (circle) =>
  circle.longitude(lng).latitude(lat).radius(maxDistance).kilometers
  )
  .return.first();
- return (locations as any).map(transformLocation);
+ return (locations as unknown as Array<Location>).map(transformLocation);
  }
 }
diff --git a/src/Redis/Transformer.ts b/src/Redis/Transformer.ts
@@ -25,7 +25,7 @@ export function transformTestData(data: TestData): Location {
 export function transformLocation(location: Location): TestData {
  return {
  id: location.id,
- lng: location.location["longitude"],
- lat: location.location["latitude"],
+ lng: location.location.longitude,
+ lat: location.location.latitude,
  };
 }
diff --git a/src/StubDatabase.ts b/src/StubDatabase.ts
@@ -9,7 +9,7 @@ export class StubDatabase extends TestDatabase {
  async connect(uri?: string | undefined): Promise<void> {}
  async disconnect(): Promise<void> {}
  async cleanup(): Promise<void> {}
- async create(data: TestData[]): Promise<void> {}
+ async create(data: Array<TestData>): Promise<void> {}
  async prepare(): Promise<void> {}
  async usageReport(): Promise<object> {
  return {};
@@ -27,7 +27,7 @@ export class StubDatabase extends TestDatabase {
  lng: number,
  lat: number,
  maxDistance: number
- ): Promise<TestData[]> {
+ ): Promise<Array<TestData>> {
  return [
  {
  id: "stub",
@@ -41,7 +41,7 @@ export class StubDatabase extends TestDatabase {
  lng: number,
  lat: number,
  maxDistance: number
- ): Promise<TestData[]> {
+ ): Promise<Array<TestData>> {
  return [
  {
  id: "stub",

diff --git a/src/TestDatabase.ts b/src/TestDatabase.ts
@@ -27,7 +27,7 @@ export abstract class TestDatabase {
  * Initialize DB with data
  * @param data
  */
- abstract create(data: TestData[]): Promise<void>;
+ abstract create(data: Array<TestData>): Promise<void>;
 
  /**
  * Prepare DB for query