Skip to content

Commit 024edc7

Browse files
committed
fix(typings): fix up adapter return types
1 parent 9ee245e commit 024edc7

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

src/db-adapters/AdapterInterface.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { SupportedOperators } from "../types";
22
import Data from '../types/Generic/Data';
3-
import Resource, { ResourceWithTypePath, ResourceWithId } from '../types/Resource';
3+
import { ResourceWithTypePath, ResourceWithId } from '../types/Resource';
44
import Relationship from '../types/Relationship';
55
import CreateQuery from "../types/Query/CreateQuery";
66
import FindQuery from "../types/Query/FindQuery";

src/db-adapters/Mongoose/MongooseAdapter.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import { getTypeName } from "../../util/naming-conventions";
2121
import * as util from "./lib";
2222
import * as Errors from '../../util/errors';
2323
import Data from "../../types/Generic/Data";
24-
import Resource, { ResourceWithTypePath } from "../../types/Resource";
24+
import { ResourceWithTypePath } from "../../types/Resource";
2525
import ResourceIdentifier from "../../types/ResourceIdentifier";
2626
import Relationship from '../../types/Relationship';
2727
import FieldDocumentation from "../../types/Documentation/Field";
@@ -116,7 +116,7 @@ export default class MongooseAdapter implements Adapter<typeof MongooseAdapter>
116116
(typeof offset !== "undefined" || typeof limit !== "undefined");
117117

118118
let primaryDocumentsPromise: Promise<Document | Document[]>,
119-
includedResourcesPromise: Promise<Resource[] | undefined>;
119+
includedResourcesPromise: Promise<ReturnedResource[] | undefined>;
120120

121121
const queryBuilder =
122122
mode === "findOne" // ternary is a hack for TS compiler
@@ -216,19 +216,19 @@ export default class MongooseAdapter implements Adapter<typeof MongooseAdapter>
216216
queryBuilder.populate(pathParts[0]);
217217
});
218218

219-
let includedResources: Resource[] = [];
219+
let includedResources: ReturnedResource[] = [];
220220
primaryDocumentsPromise = Promise.resolve(queryBuilder.exec()).then((docOrDocs) => {
221221
includedResources =
222222
objectValues(
223223
Data.fromJSON(docOrDocs) // fromJSON to handle docOrDocs === null.
224-
.flatMap<Resource>((doc) => {
224+
.flatMap<ReturnedResource>((doc) => {
225225
return Data.of(populatedPaths).flatMap((path) => {
226226
// Handle case that doc[path], which should hold id(s) of the
227227
// referenced documents, is undefined b/c the relationship isn't set.
228228
return typeof doc[path] === 'undefined'
229-
? Data.empty as Data<Resource>
229+
? Data.empty as Data<ReturnedResource>
230230
: Data.fromJSON(doc[path]).map(docAtPath => {
231-
return this.docToResource(docAtPath, fields);
231+
return this.docToResource(docAtPath, fields) as ReturnedResource;
232232
});
233233
});
234234
})
@@ -237,7 +237,7 @@ export default class MongooseAdapter implements Adapter<typeof MongooseAdapter>
237237
.reduce((acc, resource) => {
238238
acc[`${resource.type}/${resource.id}`] = resource;
239239
return acc;
240-
}, {} as { [id: string]: Resource })
240+
}, {} as { [id: string]: ReturnedResource })
241241
);
242242

243243
return docOrDocs;

0 commit comments

Comments
 (0)