@@ -14,20 +14,122 @@
 */
 
 declare module 'json-api' {
-declare type JsonApiResourceId<Type: string> = {
-id: string,
-type: Type
+declare type JSON =
+| null
+| void
+| string
+| number
+| boolean
+| { [string]: JSON }
+| Array<JSON>;
+
+declare type JSONAPIMeta = { [string]: JSON };
+
+declare type JSONAPILink =
+| string
+| {|
+href: string,
+meta?: JSONAPIMeta,
+|};
+
+declare type JSONAPILinks = {
+self?: JSONAPILink,
+related?: JSONAPILink,
+[string]: JSONAPILink,
 };
 
-declare type JsonApiResource<Type, Attributes = Object> = {
-...JsonApiResourceId<Type>,
-attributes?: Attributes,
-relationships?: Object,
-links?: Object,
-meta?: Object
+declare type JSONAPIPaginationLinks = {
+first?: ?JSONAPILink,
+last?: ?JSONAPILink,
+prev?: ?JSONAPILink,
+next?: ?JSONAPILink,
 };
 
-declare type JsonApiDocument<PrimaryResourceTypes> = {
-data: PrimaryResourceTypes | Array<PrimaryResourceTypes> | null,
+declare type JSONAPIError = {|
+id?: string,
+links?: {|
+about: JSONAPILink,
+|},
+status?: string,
+code?: string,
+title?: string,
+detail?: string,
+source?: {
+pointer?: string,
+parameter?: string,
+},
+meta?: JSONAPIMeta,
+|};
+
+declare type JSONAPIObject = {|
+version?: string,
+meta?: JSONAPIMeta,
+|};
+
+declare type JSONAPIAttributes = {
+[string]: JSON,
 };
+
+declare type JSONAPIResourceIdentifier = {|
+id: string,
+type: string,
+meta?: JSONAPIMeta,
+|};
+
+declare type JSONAPIResourceLinkage =
+| Array<JSONAPIResourceIdentifier>
+| JSONAPIResourceIdentifier
+| null;
+
+declare type JSONAPIRelationship = {|
+links?: {
+self?: JSONAPILink,
+related?: JSONAPILink,
+} & JSONAPILinks,
+data?: JSONAPIResourceLinkage,
+meta?: JSONAPIMeta,
+|};
+
+declare type JSONAPIRelationships = {
+[string]: JSONAPIRelationship,
+};
+
+declare type JSONAPIResource = {|
+id?: string,
+type: string,
+attributes?: JSONAPIAttributes,
+relationships?: JSONAPIRelationships,
+links?: JSONAPILinks,
+meta?: JSONAPIMeta,
+|};
+
+declare type JSONAPIDataDocument = {|
+data:
+| Array<JSONAPIResource | JSONAPIResourceIdentifier>
+| JSONAPIResource
+| JSONAPIResourceIdentifier
+| null,
+meta?: JSONAPIMeta,
+jsonapi?: JSONAPIObject,
+links?: JSONAPIPaginationLinks & JSONAPILinks,
+included?: Array<JSONAPIResource>,
+|};
+
+declare type JSONAPIMetaDocument = {|
+meta: JSONAPIMeta,
+jsonapi?: JSONAPIObject,
+links?: JSONAPILinks,
+|};
+
+declare type JSONAPIErrorDocument = {|
+errors: Array<JSONAPIError>,
+meta?: JSONAPIMeta,
+jsonapi?: JSONAPIObject,
+links?: JSONAPILinks,
+|};
+
+declare type JSONAPIDocument =
+| JSONAPIDataDocument
+| JSONAPIMetaDocument
+| JSONAPIErrorDocument;
 }