1
1
/*!
2
2
* js-data-jsonapi
3
- * @version 0.0.0-alpha.20 - Homepage <https://github.com/BlairAllegroTech/js-data-jsonapi>
3
+ * @version 0.0.0-alpha.21 - Homepage <https://github.com/BlairAllegroTech/js-data-jsonapi>
4
4
* @author Blair Jacobs
5
5
* @copyright (c) 2016-2017 Blair Jacobs
6
6
* @license MIT <https://github.com/BlairAllegroTech/js-data-jsonapi/blob/master/LICENSE>
@@ -324,11 +324,11 @@ return /******/ (function(modules) { // webpackBootstrap
324
324
exports . TryGetMetaData = TryGetMetaData ;
325
325
;
326
326
exports . version = {
327
- full : '0.0.0-alpha.20 ' ,
327
+ full : '0.0.0-alpha.21 ' ,
328
328
major : parseInt ( '0' , 10 ) ,
329
329
minor : parseInt ( '0' , 10 ) ,
330
330
patch : parseInt ( '0' , 10 ) ,
331
- alpha : true ? '20 ' : false ,
331
+ alpha : true ? '21 ' : false ,
332
332
beta : true ? 'false' : false
333
333
} ;
334
334
//# sourceMappingURL=JsonApiAdapter.js.map
@@ -503,25 +503,23 @@ return /******/ (function(modules) { // webpackBootstrap
503
503
return ( relation && relation [ 0 ] ) ? relation [ 0 ] : null ;
504
504
} ;
505
505
SerializationOptions . prototype . getChildRelationWithLocalField = function ( relationType , localFieldName ) {
506
- relationType = relationType . toLowerCase ( ) ;
507
- localFieldName = localFieldName . toLowerCase ( ) ;
506
+ var localFieldNameLower = localFieldName . toLowerCase ( ) ;
508
507
var relations = this . getChildRelations ( relationType ) ;
509
508
var match = null ;
510
509
DSUTILS . forEach ( relations , function ( relation ) {
511
- if ( relation . localField === localFieldName ) {
510
+ if ( relation . localField === localFieldName || relation . localField === localFieldNameLower ) {
512
511
match = relation ;
513
512
return false ;
514
513
}
515
514
} ) ;
516
515
return match ;
517
516
} ;
518
517
SerializationOptions . prototype . getChildRelationWithForeignKey = function ( relationType , foreignKeyName ) {
519
- relationType = relationType . toLowerCase ( ) ;
520
- foreignKeyName = foreignKeyName . toLowerCase ( ) ;
518
+ var foreignKeyNameLower = foreignKeyName . toLowerCase ( ) ;
521
519
var relations = this . getChildRelations ( relationType ) ;
522
520
var match = null ;
523
521
DSUTILS . forEach ( relations , function ( relation ) {
524
- if ( relation . foreignKey === foreignKeyName ) {
522
+ if ( relation . foreignKey === foreignKeyName || relation . foreignKey === foreignKeyNameLower ) {
525
523
match = relation ;
526
524
return false ;
527
525
}
@@ -548,29 +546,23 @@ return /******/ (function(modules) { // webpackBootstrap
548
546
} ) ;
549
547
} ;
550
548
SerializationOptions . prototype . getChildRelations = function ( relationType ) {
551
- relationType = relationType . toLowerCase ( ) ;
552
549
if ( this . resourceDef . relations ) {
553
- if ( this . resourceDef . relations . hasOne ) {
554
- if ( this . resourceDef . relations . hasOne [ relationType ] ) {
555
- return this . resourceDef . relations . hasOne [ relationType ] ;
556
- }
557
- }
558
- if ( this . resourceDef . relations . hasMany ) {
559
- if ( this . resourceDef . relations . hasMany [ relationType ] ) {
560
- return this . resourceDef . relations . hasMany [ relationType ] ;
561
- }
562
- }
563
550
var relationlower_1 = relationType . toLowerCase ( ) ;
564
551
var matches_1 = [ ] ;
565
552
var relationList = this . resourceDef . relationList ;
566
553
DSUTILS . forEach ( relationList , function ( relation ) {
567
554
if ( relation . type === jsDataHasMany || relation . type === jsDataHasOne ) {
568
- if ( relationlower_1 === relation . relation ) {
555
+ if ( relationType === relation . relation ) {
569
556
matches_1 . push ( relation ) ;
570
557
}
558
+ else {
559
+ if ( relationlower_1 === relation . relation ) {
560
+ matches_1 . push ( relation ) ;
561
+ LogInfo ( 'Relation Case Insensitive match made of ' + relationType , matches_1 ) ;
562
+ }
563
+ }
571
564
}
572
565
} ) ;
573
- LogInfo ( 'Relation Case Insensitive match made of ' + relationType , matches_1 ) ;
574
566
return matches_1 ;
575
567
}
576
568
return null ;
@@ -580,7 +572,7 @@ return /******/ (function(modules) { // webpackBootstrap
580
572
var relationList = this . resourceDef . relationList ;
581
573
var match = null ;
582
574
DSUTILS . forEach ( relationList , function ( relation ) {
583
- if ( relation . localField === relationlower ) {
575
+ if ( relation . localField === relationName || relation . localField === relationlower ) {
584
576
match = relation ;
585
577
return false ;
586
578
}
@@ -1205,7 +1197,8 @@ return /******/ (function(modules) { // webpackBootstrap
1205
1197
if ( data . type && data . GetSelfLink && data . GetSelfLink ( ) ) {
1206
1198
var selfLinkArray = data . GetSelfLink ( ) . split ( '/' ) ;
1207
1199
options . enumerateAllParentRelations ( function ( rel ) {
1208
- var parentResourceIndex = selfLinkArray . lastIndexOf ( rel . relation ) ;
1200
+ var parentDefinition = options . getResource ( rel . relation ) ;
1201
+ var parentResourceIndex = selfLinkArray . lastIndexOf ( parentDefinition . def ( ) . endpoint ) ;
1209
1202
if ( parentResourceIndex >= 0 && rel . localKey ) {
1210
1203
fields [ rel . localKey ] = selfLinkArray [ parentResourceIndex + 1 ] ;
1211
1204
var parentLink = selfLinkArray . slice ( 0 , parentResourceIndex + 2 ) . join ( '/' ) ;
0 commit comments