Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Handling cases where jsonapi.version isn't set #378

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Handling cases where jsonapi.version isn't set #378

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1069ff1
Handling cases where jsonapi.version isn't set
krainboltgreene Apr 30, 2019
d1c85c9
Don't bother returning false if we're just going to check for the dat…
krainboltgreene Apr 30, 2019
e44f9e8
Woops, used the wrong operator, we want to make sure it HAS a data pr…
krainboltgreene Apr 30, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 11 additions & 6 deletions addon/utils/serialize-and-push.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,20 @@ import SerializerRegistry from 'ember-data/types/registries/serializer';
import { CollectionResourceDoc, Document as JSONApiDoc, DocWithData, SingleResourceDoc } from 'jsonapi-typescript';
import { _getModelClass, _getModelName, _getStoreFromRecord } from './build-url';

function isJsonApi(raw: any): raw is JSONApiDoc {
return raw.jsonapi && raw.jsonapi.version;
}
function isDocWithData(doc: any): doc is DocWithData {
return isJsonApi(doc) && ['object', 'array'].indexOf(typeOf((doc as DocWithData).data)) >= 0;
function isValidResponse(doc: any): doc is DocWithData {
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe I don't understand typescript, but why isn't the return type boolean?

// If the document has this signature we can trust what we're about to receive
if (doc.jsonapi && doc.jsonapi.version) {
return true
}

console.debug("Received a repsonse that doesn't have a /jsonapi/version property")

// Don't even bother if the data propery doesn't exist
return typeof response.data !== 'undefined';
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't this be doc.data?

}

export default function serializeAndPush(this: Model, response: any) {
if (!isDocWithData(response)) {
if (!isValidResponse(response)) {
// tslint:disable-next-line:no-console
console.warn(
'serializeAndPush may only be used with a JSON API document. Ignoring response. ' +
Expand Down