ts-japi 1.7.0 → 1.8.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.prettierignore +3 -1
- package/.release-please-manifest.json +1 -1
- package/CHANGELOG.md +7 -0
- package/lib/classes/cache.d.ts +4 -4
- package/lib/classes/cache.d.ts.map +1 -1
- package/lib/classes/error-serializer.d.ts +2 -2
- package/lib/classes/error-serializer.d.ts.map +1 -1
- package/lib/classes/paginator.js.map +1 -1
- package/lib/classes/relator.d.ts +1 -1
- package/lib/classes/relator.d.ts.map +1 -1
- package/lib/classes/serializer.d.ts +2 -1
- package/lib/classes/serializer.d.ts.map +1 -1
- package/lib/classes/serializer.js +10 -4
- package/lib/classes/serializer.js.map +1 -1
- package/lib/interfaces/serializer.interface.d.ts +14 -3
- package/lib/interfaces/serializer.interface.d.ts.map +1 -1
- package/lib/types/global.types.d.ts +6 -0
- package/lib/types/global.types.d.ts.map +1 -1
- package/lib/utils/merge.d.ts.map +1 -1
- package/lib/utils/merge.js +3 -2
- package/lib/utils/merge.js.map +1 -1
- package/lib/utils/serializer.utils.d.ts +3 -3
- package/lib/utils/serializer.utils.d.ts.map +1 -1
- package/lib/utils/serializer.utils.js +29 -6
- package/lib/utils/serializer.utils.js.map +1 -1
- package/package.json +1 -1
- package/release-please-config.json +0 -2
package/.prettierignore
CHANGED
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,12 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
+
## [1.8.0](https://github.com/mathematic-inc/ts-japi/compare/v1.7.0...v1.8.0) (2022-09-30)
|
|
4
|
+
|
|
5
|
+
|
|
6
|
+
### Features
|
|
7
|
+
|
|
8
|
+
* implement support for the `include` spec ([#53](https://github.com/mathematic-inc/ts-japi/issues/53)) ([fe4f276](https://github.com/mathematic-inc/ts-japi/commit/fe4f276cb2338b7540a17308cb020ca6e1bd5478))
|
|
9
|
+
|
|
3
10
|
## [1.7.0](https://github.com/mathematic-inc/ts-japi/compare/v1.6.3...v1.7.0) (2022-08-05)
|
|
4
11
|
|
|
5
12
|
|
package/lib/classes/cache.d.ts
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import { SerializerOptions } from '../interfaces/serializer.interface';
|
|
2
|
-
import { DataDocument } from '../interfaces/json-api.interface';
|
|
3
|
-
import { SingleOrArray, nullish } from '../types/global.types';
|
|
4
1
|
import { CacheOptions } from '../interfaces/cache.interface';
|
|
5
|
-
|
|
2
|
+
import { DataDocument } from '../interfaces/json-api.interface';
|
|
3
|
+
import { SerializerOptions } from '../interfaces/serializer.interface';
|
|
4
|
+
import { Dictionary, nullish, SingleOrArray } from '../types/global.types';
|
|
5
|
+
export default class Cache<PrimaryType extends Dictionary<any>> {
|
|
6
6
|
/**
|
|
7
7
|
* The default max for document storage
|
|
8
8
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cache.d.ts","sourceRoot":"","sources":["../../src/classes/cache.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"cache.d.ts","sourceRoot":"","sources":["../../src/classes/cache.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAC7D,OAAO,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AAChE,OAAO,EAAE,iBAAiB,EAAE,MAAM,oCAAoC,CAAC;AACvE,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAE3E,MAAM,CAAC,OAAO,OAAO,KAAK,CAAC,WAAW,SAAS,UAAU,CAAC,GAAG,CAAC;IAC5D;;OAEG;IACH,OAAc,YAAY,SAAM;IAEhC,0CAA0C;IAC1C,OAAO,CAAC,OAAO,CAMR;IAEP;;OAEG;IACH,OAAO,CAAC,KAAK,CAA8B;IAE3C;;OAEG;IACH,OAAO,CAAC,QAAQ,CAGS;IAEzB;;;;OAIG;gBACgB,OAAO,GAAE,OAAO,CAAC,YAAY,CAAC,WAAW,CAAC,CAAM;IAKnE,6CAA6C;IACtC,GAAG,CACR,IAAI,EAAE,aAAa,CAAC,WAAW,CAAC,GAAG,OAAO,EAC1C,OAAO,CAAC,EAAE,OAAO,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC;IAUnD,6CAA6C;IACtC,GAAG,CACR,IAAI,EAAE,aAAa,CAAC,WAAW,CAAC,GAAG,OAAO,EAC1C,QAAQ,EAAE,OAAO,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC,EAC5C,OAAO,CAAC,EAAE,OAAO,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC;CAQpD"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { ErrorSerializerOptions } from '../interfaces/error-serializer.interface';
|
|
2
2
|
import { ErrorDocument } from '../interfaces/json-api.interface';
|
|
3
|
-
import { SingleOrArray } from '../types/global.types';
|
|
3
|
+
import { Dictionary, SingleOrArray } from '../types/global.types';
|
|
4
4
|
/**
|
|
5
5
|
* The {@link ErrorSerializer} class is used to serialize errors.
|
|
6
6
|
*
|
|
@@ -9,7 +9,7 @@ import { SingleOrArray } from '../types/global.types';
|
|
|
9
9
|
* [[include:error-serializer.example.ts]]
|
|
10
10
|
* ```
|
|
11
11
|
*/
|
|
12
|
-
export default class ErrorSerializer<ErrorType
|
|
12
|
+
export default class ErrorSerializer<ErrorType extends Dictionary<any>> {
|
|
13
13
|
/**
|
|
14
14
|
* Default options. Can be edited to change default options globally.
|
|
15
15
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"error-serializer.d.ts","sourceRoot":"","sources":["../../src/classes/error-serializer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,0CAA0C,CAAC;AAElF,OAAO,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAC;AAEjE,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"error-serializer.d.ts","sourceRoot":"","sources":["../../src/classes/error-serializer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,0CAA0C,CAAC;AAElF,OAAO,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAC;AAEjE,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAGlE;;;;;;;GAOG;AACH,MAAM,CAAC,OAAO,OAAO,eAAe,CAAC,SAAS,SAAS,UAAU,CAAC,GAAG,CAAC;IACpE;;OAEG;IACH,OAAc,cAAc;;;;;;;;;;;;;;;MAe1B;IAEF;;OAEG;IACH,OAAO,CAAC,OAAO,CAA8C;IAE7D;;;;;OAKG;gBACgB,OAAO,GAAE,OAAO,CAAC,sBAAsB,CAAC,SAAS,CAAC,CAAM;IAK3E;;;;;OAKG;IACI,SAAS,CACd,MAAM,EAAE,aAAa,CAAC,SAAS,CAAC,EAChC,OAAO,CAAC,EAAE,OAAO,CAAC,sBAAsB,CAAC,SAAS,CAAC,CAAC;CAiFvD"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"paginator.js","sourceRoot":"","sources":["../../src/classes/paginator.ts"],"names":[],"mappings":";;;;;AACA,sEAAwC;AAGxC;;;;;;;GAOG;AACH,MAAqB,SAAS;IAC5B,4CAA4C;IACrC,QAAQ,CAA+D;IAE9E;;;;OAIG;IACH,YAAmB,QAAwE;QACzF,IAAI,CAAC,QAAQ,GAAG,CAAC,IAA6B,
|
|
1
|
+
{"version":3,"file":"paginator.js","sourceRoot":"","sources":["../../src/classes/paginator.ts"],"names":[],"mappings":";;;;;AACA,sEAAwC;AAGxC;;;;;;;GAOG;AACH,MAAqB,SAAS;IAC5B,4CAA4C;IACrC,QAAQ,CAA+D;IAE9E;;;;OAIG;IACH,YAAmB,QAAwE;QACzF,IAAI,CAAC,QAAQ,GAAG,CAAC,IAA6B,EAA6B,EAAE;YAC3E,MAAM,KAAK,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;YAC7B,IAAI,CAAC,KAAK;gBAAE,OAAO;YACnB,OAAO;gBACL,KAAK,EAAE,OAAO,KAAK,CAAC,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,oBAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK;gBAC5E,IAAI,EAAE,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,oBAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI;gBACxE,IAAI,EAAE,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,oBAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI;gBACxE,IAAI,EAAE,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,oBAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI;aACzE,CAAC;QACJ,CAAC,CAAC;IACJ,CAAC;CACF;AArBD,4BAqBC"}
|
package/lib/classes/relator.d.ts
CHANGED
|
@@ -44,7 +44,7 @@ export default class Relator<PrimaryType, RelatedType extends Dictionary<any> =
|
|
|
44
44
|
/** @internal Creates related identifiers */
|
|
45
45
|
getRelatedIdentifier: (data: RelatedType, options?: SerializerOptions<RelatedType> | undefined) => ResourceIdentifier;
|
|
46
46
|
/** @internal Creates related resources */
|
|
47
|
-
getRelatedResource: (data: RelatedType, options?: SerializerOptions<RelatedType
|
|
47
|
+
getRelatedResource: (data: RelatedType, options?: Partial<SerializerOptions<RelatedType>>, helpers?: Helpers<RelatedType>, relatorDataCache?: Map<Relator<any>, Dictionary<any>[]>) => Promise<Resource<RelatedType>>;
|
|
48
48
|
/** @internal Gets related links from primary data and related data */
|
|
49
49
|
getRelatedLinks(data: PrimaryType, relatedData: RelatedType | RelatedType[] | nullish): Dictionary<nullish | Link> | undefined;
|
|
50
50
|
/** @internal Gets related meta from primary data and related data */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"relator.d.ts","sourceRoot":"","sources":["../../src/classes/relator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AACjE,OAAO,EAAE,iBAAiB,EAAE,MAAM,oCAAoC,CAAC;AACvE,OAAO,IAAI,MAAM,sBAAsB,CAAC;AACxC,OAAO,IAAI,MAAM,sBAAsB,CAAC;AACxC,OAAO,YAAqC,MAAM,8BAA8B,CAAC;AACjF,OAAO,kBAAkB,MAAM,qCAAqC,CAAC;AACrE,OAAO,QAAQ,MAAM,0BAA0B,CAAC;AAChD,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAE5D,OAAO,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAC;AACpD,OAAO,UAAU,MAAM,cAAc,CAAC;AAEtC;;;;;;;;GAQG;AACH,MAAM,CAAC,OAAO,OAAO,OAAO,CAAC,WAAW,EAAE,WAAW,SAAS,UAAU,CAAC,GAAG,CAAC,GAAG,GAAG;IACjF;;OAEG;IACH,OAAc,cAAc;;MAE1B;IAEF;;OAEG;IACH,OAAO,CAAC,OAAO,CAA2C;IAEnD,WAAW,EAAE,MAAM,CAAC;IAC3B;;;;;;OAMG;gBAED,KAAK,EAAE,CAAC,IAAI,EAAE,WAAW,KAAK,OAAO,CAAC,WAAW,GAAG,WAAW,EAAE,GAAG,OAAO,CAAC,EAC5E,UAAU,EAAE,UAAU,CAAC,WAAW,CAAC,EACnC,OAAO,GAAE,OAAO,CAAC,cAAc,CAAC,WAAW,EAAE,WAAW,CAAC,CAAM;IAWjE,qDAAqD;IAC9C,cAAc,EAAE,CAAC,IAAI,EAAE,WAAW,KAAK,OAAO,CAAC,WAAW,GAAG,WAAW,EAAE,GAAG,OAAO,CAAC,CAAC;IAE7F,sCAAsC;IAC/B,kBAAkB,EAAE,MAAM,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC,GAAG,SAAS,CAAC;IAEvF,4CAA4C;IACrC,oBAAoB,EAAE,CAC3B,IAAI,EAAE,WAAW,EACjB,OAAO,CAAC,EAAE,iBAAiB,CAAC,WAAW,CAAC,GAAG,SAAS,KACjD,kBAAkB,CAAC;IAExB,0CAA0C;IACnC,kBAAkB,EAAE,CACzB,IAAI,EAAE,WAAW,EACjB,OAAO,CAAC,EAAE,iBAAiB,CAAC,WAAW,CAAC,
|
|
1
|
+
{"version":3,"file":"relator.d.ts","sourceRoot":"","sources":["../../src/classes/relator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AACjE,OAAO,EAAE,iBAAiB,EAAE,MAAM,oCAAoC,CAAC;AACvE,OAAO,IAAI,MAAM,sBAAsB,CAAC;AACxC,OAAO,IAAI,MAAM,sBAAsB,CAAC;AACxC,OAAO,YAAqC,MAAM,8BAA8B,CAAC;AACjF,OAAO,kBAAkB,MAAM,qCAAqC,CAAC;AACrE,OAAO,QAAQ,MAAM,0BAA0B,CAAC;AAChD,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAE5D,OAAO,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAC;AACpD,OAAO,UAAU,MAAM,cAAc,CAAC;AAEtC;;;;;;;;GAQG;AACH,MAAM,CAAC,OAAO,OAAO,OAAO,CAAC,WAAW,EAAE,WAAW,SAAS,UAAU,CAAC,GAAG,CAAC,GAAG,GAAG;IACjF;;OAEG;IACH,OAAc,cAAc;;MAE1B;IAEF;;OAEG;IACH,OAAO,CAAC,OAAO,CAA2C;IAEnD,WAAW,EAAE,MAAM,CAAC;IAC3B;;;;;;OAMG;gBAED,KAAK,EAAE,CAAC,IAAI,EAAE,WAAW,KAAK,OAAO,CAAC,WAAW,GAAG,WAAW,EAAE,GAAG,OAAO,CAAC,EAC5E,UAAU,EAAE,UAAU,CAAC,WAAW,CAAC,EACnC,OAAO,GAAE,OAAO,CAAC,cAAc,CAAC,WAAW,EAAE,WAAW,CAAC,CAAM;IAWjE,qDAAqD;IAC9C,cAAc,EAAE,CAAC,IAAI,EAAE,WAAW,KAAK,OAAO,CAAC,WAAW,GAAG,WAAW,EAAE,GAAG,OAAO,CAAC,CAAC;IAE7F,sCAAsC;IAC/B,kBAAkB,EAAE,MAAM,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC,GAAG,SAAS,CAAC;IAEvF,4CAA4C;IACrC,oBAAoB,EAAE,CAC3B,IAAI,EAAE,WAAW,EACjB,OAAO,CAAC,EAAE,iBAAiB,CAAC,WAAW,CAAC,GAAG,SAAS,KACjD,kBAAkB,CAAC;IAExB,0CAA0C;IACnC,kBAAkB,EAAE,CACzB,IAAI,EAAE,WAAW,EACjB,OAAO,CAAC,EAAE,OAAO,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC,EACjD,OAAO,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,EAC9B,gBAAgB,CAAC,EAAE,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC,KACpD,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC;IAEpC,sEAAsE;IAC/D,eAAe,CAAC,IAAI,EAAE,WAAW,EAAE,WAAW,EAAE,WAAW,GAAG,WAAW,EAAE,GAAG,OAAO;IAW5F,qEAAqE;IAC9D,cAAc,CAAC,IAAI,EAAE,WAAW,EAAE,WAAW,EAAE,WAAW,GAAG,WAAW,EAAE,GAAG,OAAO;IAQ3F,gDAAgD;IACnC,eAAe,CAC1B,IAAI,EAAE,WAAW,EACjB,gBAAgB,CAAC,EAAE,UAAU,CAAC,GAAG,CAAC,EAAE,GACnC,OAAO,CAAC,YAAY,GAAG,SAAS,CAAC;CAmCrC"}
|
|
@@ -28,6 +28,7 @@ export default class Serializer<PrimaryType extends Dictionary<any> = any> {
|
|
|
28
28
|
onlyRelationship: boolean;
|
|
29
29
|
cache: boolean;
|
|
30
30
|
depth: number;
|
|
31
|
+
include: number;
|
|
31
32
|
projection: null;
|
|
32
33
|
linkers: {};
|
|
33
34
|
metaizers: {};
|
|
@@ -66,7 +67,7 @@ export default class Serializer<PrimaryType extends Dictionary<any> = any> {
|
|
|
66
67
|
/** @internal Generates a `ResourceIdentifier`. */
|
|
67
68
|
createIdentifier(data: PrimaryType, options?: SerializerOptions<PrimaryType>): ResourceIdentifier;
|
|
68
69
|
/** @internal Generates a `Resource`. */
|
|
69
|
-
createResource(data: PrimaryType, options?: SerializerOptions<PrimaryType
|
|
70
|
+
createResource(data: PrimaryType, options?: Partial<SerializerOptions<PrimaryType>>, helpers?: Helpers<PrimaryType>, relatorDataCache?: Map<Relator<any>, Dictionary<any>[]>): Promise<Resource<PrimaryType>>;
|
|
70
71
|
/**
|
|
71
72
|
* The actual serialization function.
|
|
72
73
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serializer.d.ts","sourceRoot":"","sources":["../../src/classes/serializer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AAChE,OAAO,EAAE,iBAAiB,EAAE,MAAM,oCAAoC,CAAC;
|
|
1
|
+
{"version":3,"file":"serializer.d.ts","sourceRoot":"","sources":["../../src/classes/serializer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AAChE,OAAO,EAAE,iBAAiB,EAAE,MAAM,oCAAoC,CAAC;AAGvE,OAAO,kBAAiD,MAAM,qCAAqC,CAAC;AACpG,OAAO,QAA6B,MAAM,0BAA0B,CAAC;AACrE,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAE3E,OAAO,EAAE,OAAO,EAAmB,MAAM,2BAA2B,CAAC;AACrE,OAAO,KAAK,MAAM,SAAS,CAAC;AAC5B,OAAO,OAAO,MAAM,WAAW,CAAC;AAEhC;;;;;;;;GAQG;AACH,MAAM,CAAC,OAAO,OAAO,UAAU,CAAC,WAAW,SAAS,UAAU,CAAC,GAAG,CAAC,GAAG,GAAG;IACvE;;OAEG;IACH,OAAc,cAAc;;;;;;;;;;;;;MAa1B;IAEF;;OAEG;IACI,cAAc,EAAE,MAAM,CAAC;IAE9B;;OAEG;IACH,OAAO,CAAC,OAAO,CAAiC;IAEhD;;OAEG;IACI,OAAO,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;IAErC;;OAEG;IACI,KAAK,qBAA4B;IAExC;;;;;OAKG;gBAED,cAAc,EAAE,MAAM,EACtB,OAAO,GAAE,OAAO,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAM;IAcvD;;OAEG;IACI,WAAW;IAIlB;;OAEG;IACI,WAAW,CAAC,QAAQ,EAAE,iBAAiB,CAAC,WAAW,CAAC,CAAC,UAAU,CAAC;IAKvE,kDAAkD;IAC3C,gBAAgB,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO,CAAC,EAAE,iBAAiB,CAAC,WAAW,CAAC;IAanF,wCAAwC;IAC3B,cAAc,CACzB,IAAI,EAAE,WAAW,EACjB,OAAO,CAAC,EAAE,OAAO,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC,EACjD,OAAO,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,EAC9B,gBAAgB,CAAC,EAAE,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;IAqDzD;;;;;OAKG;IACU,SAAS,CACpB,IAAI,EAAE,aAAa,CAAC,WAAW,CAAC,GAAG,OAAO,EAC1C,OAAO,CAAC,EAAE,OAAO,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC;CAgJpD"}
|
|
@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
const error_model_1 = __importDefault(require("../models/error.model"));
|
|
6
7
|
const resource_identifier_model_1 = __importDefault(require("../models/resource-identifier.model"));
|
|
7
8
|
const resource_model_1 = __importDefault(require("../models/resource.model"));
|
|
8
9
|
const merge_1 = __importDefault(require("../utils/merge"));
|
|
@@ -30,6 +31,7 @@ class Serializer {
|
|
|
30
31
|
onlyRelationship: false,
|
|
31
32
|
cache: false,
|
|
32
33
|
depth: 0,
|
|
34
|
+
include: 0,
|
|
33
35
|
projection: null,
|
|
34
36
|
linkers: {},
|
|
35
37
|
metaizers: {},
|
|
@@ -97,6 +99,9 @@ class Serializer {
|
|
|
97
99
|
options = this.options;
|
|
98
100
|
helpers = this.helpers;
|
|
99
101
|
}
|
|
102
|
+
if (!options.idKey) {
|
|
103
|
+
throw new error_model_1.default({ detail: 'options must provide a value for `idKey`' });
|
|
104
|
+
}
|
|
100
105
|
const resourceOptions = {};
|
|
101
106
|
// Get ID before projections.
|
|
102
107
|
const id = data[options.idKey];
|
|
@@ -120,10 +125,10 @@ class Serializer {
|
|
|
120
125
|
resourceOptions.relationships = relationships;
|
|
121
126
|
}
|
|
122
127
|
// Handling links
|
|
123
|
-
if (options.linkers
|
|
128
|
+
if (options.linkers?.resource) {
|
|
124
129
|
resourceOptions.links = { self: options.linkers.resource.link(data) };
|
|
125
130
|
}
|
|
126
|
-
if (options.metaizers
|
|
131
|
+
if (options.metaizers?.resource) {
|
|
127
132
|
resourceOptions.meta = options.metaizers.resource.metaize(data);
|
|
128
133
|
}
|
|
129
134
|
return new resource_model_1.default(id, type, resourceOptions);
|
|
@@ -246,8 +251,9 @@ class Serializer {
|
|
|
246
251
|
else {
|
|
247
252
|
document.data = await Promise.all(dto.map(createResource));
|
|
248
253
|
}
|
|
249
|
-
|
|
250
|
-
|
|
254
|
+
const include = o.include || o.depth;
|
|
255
|
+
if (relators && include) {
|
|
256
|
+
document.included = (document.included || []).concat(await (0, serializer_utils_1.recurseRelators)(dto, relators, include, keys, relatorDataCache));
|
|
251
257
|
}
|
|
252
258
|
if (wasSingle) {
|
|
253
259
|
document.data = document.data[0];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serializer.js","sourceRoot":"","sources":["../../src/classes/serializer.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"serializer.js","sourceRoot":"","sources":["../../src/classes/serializer.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
|
+
import Cache from '../classes/cache';
|
|
1
2
|
import Linker from '../classes/linker';
|
|
2
3
|
import Metaizer from '../classes/metaizer';
|
|
3
4
|
import Paginator from '../classes/paginator';
|
|
4
5
|
import Relator from '../classes/relator';
|
|
5
|
-
import { Dictionary,
|
|
6
|
-
import Cache from '../classes/cache';
|
|
6
|
+
import { Dictionary, nullish, Paths, SingleOrArray } from '../types/global.types';
|
|
7
7
|
export interface SerializerOptions<PrimaryType extends Dictionary<any> = any> {
|
|
8
8
|
/**
|
|
9
9
|
* The key name for the identifier in the resource.
|
|
@@ -40,7 +40,7 @@ export interface SerializerOptions<PrimaryType extends Dictionary<any> = any> {
|
|
|
40
40
|
* Whether to only serialize the identifier.
|
|
41
41
|
*
|
|
42
42
|
* This option will ignore the options
|
|
43
|
-
* {@link SerializerOptions.
|
|
43
|
+
* {@link SerializerOptions.include | depth}
|
|
44
44
|
*
|
|
45
45
|
* @defaultValue `false`
|
|
46
46
|
*/
|
|
@@ -78,8 +78,19 @@ export interface SerializerOptions<PrimaryType extends Dictionary<any> = any> {
|
|
|
78
78
|
* Must be a number in `[0, Infinity]`.
|
|
79
79
|
*
|
|
80
80
|
* @defaultValue `0`
|
|
81
|
+
* @deprecated Replaced by `include`
|
|
81
82
|
*/
|
|
82
83
|
depth: number;
|
|
84
|
+
/**
|
|
85
|
+
* Which resources to include. See [docs](https://jsonapi.org/format/#fetching-includes)
|
|
86
|
+
*
|
|
87
|
+
* If passed as a numeric value, all related resources will be included up to the given depth.
|
|
88
|
+
*
|
|
89
|
+
* If provided this will superceed the use of `depth`
|
|
90
|
+
* If not provided, or explicitly nullish, then behaviour will default to using `depth`
|
|
91
|
+
* If provided as an empty array, then no relationships will be included.
|
|
92
|
+
*/
|
|
93
|
+
include: number | Paths<PrimaryType>[] | string[];
|
|
83
94
|
/**
|
|
84
95
|
* An object of 0 *OR* 1 (**NOT BOTH**) to denote hide or show attributes respectively.
|
|
85
96
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serializer.interface.d.ts","sourceRoot":"","sources":["../../src/interfaces/serializer.interface.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,mBAAmB,CAAC;AACvC,OAAO,QAAQ,MAAM,qBAAqB,CAAC;AAC3C,OAAO,SAAS,MAAM,sBAAsB,CAAC;AAC7C,OAAO,OAAO,MAAM,oBAAoB,CAAC;AACzC,OAAO,EAAE,UAAU,EAAE,
|
|
1
|
+
{"version":3,"file":"serializer.interface.d.ts","sourceRoot":"","sources":["../../src/interfaces/serializer.interface.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,kBAAkB,CAAC;AACrC,OAAO,MAAM,MAAM,mBAAmB,CAAC;AACvC,OAAO,QAAQ,MAAM,qBAAqB,CAAC;AAC3C,OAAO,SAAS,MAAM,sBAAsB,CAAC;AAC7C,OAAO,OAAO,MAAM,oBAAoB,CAAC;AACzC,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAElF,MAAM,WAAW,iBAAiB,CAAC,WAAW,SAAS,UAAU,CAAC,GAAG,CAAC,GAAG,GAAG;IAC1E;;;;OAIG;IACH,KAAK,EAAE,MAAM,WAAW,CAAC;IAEzB;;;;OAIG;IACH,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IAEvB;;;;;OAKG;IACH,KAAK,EAAE,OAAO,GAAG,KAAK,CAAC,WAAW,CAAC,CAAC;IAEpC;;;;;;;;;;OAUG;IACH,QAAQ,EAAE,OAAO,CAAC;IAElB;;;;;;;OAOG;IACH,cAAc,EAAE,OAAO,CAAC;IAExB;;;;;;;;;;;;OAYG;IACH,gBAAgB,EAAE,MAAM,CAAC;IAEzB;;;;;;OAMG;IACH,UAAU,EAAE,OAAO,CAAC;IAEpB;;;;;;;;;;;;OAYG;IACH,KAAK,EAAE,MAAM,CAAC;IAEd;;;;;;;;OAQG;IACH,OAAO,EAAE,MAAM,GAAG,KAAK,CAAC,WAAW,CAAC,EAAE,GAAG,MAAM,EAAE,CAAC;IAElD;;;;;;;;OAQG;IACH,UAAU,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,WAAW,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,IAAI,GAAG,SAAS,CAAC;IAEzE;;;;;;;;OAQG;IACH,QAAQ,CAAC,EACL,OAAO,CAAC,WAAW,CAAC,GACpB,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,GAC3B,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC;IAEzC;;OAEG;IACH,OAAO,EAAE;QACP;;WAEG;QACH,QAAQ,CAAC,EAAE,MAAM,CAAC,CAAC,aAAa,CAAC,WAAW,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;QAE1D;;WAEG;QACH,QAAQ,CAAC,EAAE,MAAM,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC;QAEjC;;WAEG;QACH,SAAS,CAAC,EAAE,SAAS,CAAC,WAAW,CAAC,CAAC;KACpC,CAAC;IAEF;;OAEG;IACH,SAAS,EAAE;QACT;;WAEG;QACH,OAAO,CAAC,EAAE,QAAQ,CAAC,EAAE,CAAC,CAAC;QAEvB;;WAEG;QACH,QAAQ,CAAC,EAAE,QAAQ,CAAC,CAAC,aAAa,CAAC,WAAW,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;QAE5D;;WAEG;QACH,QAAQ,CAAC,EAAE,QAAQ,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC;KACpC,CAAC;CACH"}
|
|
@@ -11,4 +11,10 @@ export declare type VariadicFunction<Dependencies extends any[], ReturnType> = (
|
|
|
11
11
|
export declare type Dictionary<T> = Record<string | number | symbol, T>;
|
|
12
12
|
export declare type nullish = null | undefined;
|
|
13
13
|
export declare type UnionToIntersection<U> = (U extends any ? (k: U) => void : never) extends (k: infer I) => void ? I : never;
|
|
14
|
+
declare type Join<K, P> = K extends string | number ? P extends string | number ? `${K}${'' extends P ? '' : '.'}${P}` : never : never;
|
|
15
|
+
declare type Prev = [never, 0, 1, 2, 3, 4, 5, 6, 7, ...0[]];
|
|
16
|
+
export declare type Paths<T, D extends number = 10> = [D] extends [never] ? never : T extends object ? {
|
|
17
|
+
[K in keyof T]-?: K extends string | number ? `${K}` | Join<K, Paths<T[K], Prev[D]>> : never;
|
|
18
|
+
}[keyof T] : '';
|
|
19
|
+
export {};
|
|
14
20
|
//# sourceMappingURL=global.types.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"global.types.d.ts","sourceRoot":"","sources":["../../src/types/global.types.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,oBAAY,aAAa,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;AAEvC;;;;GAIG;AACH,oBAAY,gBAAgB,CAAC,YAAY,SAAS,GAAG,EAAE,EAAE,UAAU,IAAI,CACrE,GAAG,YAAY,EAAE,YAAY,KAC1B,UAAU,CAAC;AAEhB,oBAAY,UAAU,CAAC,CAAC,IAAI,MAAM,CAAC,MAAM,GAAG,MAAM,GAAG,MAAM,EAAE,CAAC,CAAC,CAAC;AAEhE,oBAAY,OAAO,GAAG,IAAI,GAAG,SAAS,CAAC;AAEvC,oBAAY,mBAAmB,CAAC,CAAC,IAAI,CAAC,CAAC,SAAS,GAAG,GAAG,CAAC,CAAC,EAAE,CAAC,KAAK,IAAI,GAAG,KAAK,CAAC,SAAS,CACpF,CAAC,EAAE,MAAM,CAAC,KACP,IAAI,GACL,CAAC,GACD,KAAK,CAAC"}
|
|
1
|
+
{"version":3,"file":"global.types.d.ts","sourceRoot":"","sources":["../../src/types/global.types.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,oBAAY,aAAa,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;AAEvC;;;;GAIG;AACH,oBAAY,gBAAgB,CAAC,YAAY,SAAS,GAAG,EAAE,EAAE,UAAU,IAAI,CACrE,GAAG,YAAY,EAAE,YAAY,KAC1B,UAAU,CAAC;AAEhB,oBAAY,UAAU,CAAC,CAAC,IAAI,MAAM,CAAC,MAAM,GAAG,MAAM,GAAG,MAAM,EAAE,CAAC,CAAC,CAAC;AAEhE,oBAAY,OAAO,GAAG,IAAI,GAAG,SAAS,CAAC;AAEvC,oBAAY,mBAAmB,CAAC,CAAC,IAAI,CAAC,CAAC,SAAS,GAAG,GAAG,CAAC,CAAC,EAAE,CAAC,KAAK,IAAI,GAAG,KAAK,CAAC,SAAS,CACpF,CAAC,EAAE,MAAM,CAAC,KACP,IAAI,GACL,CAAC,GACD,KAAK,CAAC;AAEV,aAAK,IAAI,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,SAAS,MAAM,GAAG,MAAM,GACvC,CAAC,SAAS,MAAM,GAAG,MAAM,GACvB,GAAG,CAAC,GAAG,EAAE,SAAS,CAAC,GAAG,EAAE,GAAG,GAAG,GAAG,CAAC,EAAE,GACpC,KAAK,GACP,KAAK,CAAC;AAEV,aAAK,IAAI,GAAG,CAAC,KAAK,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC;AAEpD,oBAAY,KAAK,CAAC,CAAC,EAAE,CAAC,SAAS,MAAM,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,GAC7D,KAAK,GACL,CAAC,SAAS,MAAM,GAChB;KACG,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,MAAM,GAAG,MAAM,GAAG,GAAG,CAAC,EAAE,GAAG,IAAI,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,KAAK;CAC7F,CAAC,MAAM,CAAC,CAAC,GACV,EAAE,CAAC"}
|
package/lib/utils/merge.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"merge.d.ts","sourceRoot":"","sources":["../../src/utils/merge.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAGxE;;;;;GAKG;AACH,MAAM,CAAC,OAAO,UAAU,KAAK,CAAC,CAAC,SAAS,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC,SAAS,UAAU,CAAC,GAAG,CAAC,EAAE,EAClF,MAAM,EAAE,CAAC,EACT,GAAG,OAAO,EAAE,CAAC,GACZ,CAAC,GAAG,mBAAmB,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"merge.d.ts","sourceRoot":"","sources":["../../src/utils/merge.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAGxE;;;;;GAKG;AACH,MAAM,CAAC,OAAO,UAAU,KAAK,CAAC,CAAC,SAAS,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC,SAAS,UAAU,CAAC,GAAG,CAAC,EAAE,EAClF,MAAM,EAAE,CAAC,EACT,GAAG,OAAO,EAAE,CAAC,GACZ,CAAC,GAAG,mBAAmB,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAiBpC"}
|
package/lib/utils/merge.js
CHANGED
|
@@ -13,10 +13,11 @@ function merge(target, ...sources) {
|
|
|
13
13
|
const source = sources.shift();
|
|
14
14
|
if ((0, is_plain_object_1.isPlainObject)(target) && (0, is_plain_object_1.isPlainObject)(source)) {
|
|
15
15
|
for (const key of Object.keys(source)) {
|
|
16
|
-
|
|
16
|
+
const sourceItem = source[key];
|
|
17
|
+
if ((0, is_plain_object_1.isPlainObject)(sourceItem)) {
|
|
17
18
|
if (!target[key])
|
|
18
19
|
Object.assign(target, { [key]: {} });
|
|
19
|
-
merge(target[key],
|
|
20
|
+
merge(target[key], sourceItem);
|
|
20
21
|
}
|
|
21
22
|
else {
|
|
22
23
|
Object.assign(target, { [key]: source[key] });
|
package/lib/utils/merge.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"merge.js","sourceRoot":"","sources":["../../src/utils/merge.ts"],"names":[],"mappings":";;AACA,uDAAkD;AAElD;;;;;GAKG;AACH,SAAwB,KAAK,CAC3B,MAAS,EACT,GAAG,OAAU;IAEb,IAAI,CAAC,OAAO,CAAC,MAAM;QAAE,OAAO,MAA4C,CAAC;IACzE,MAAM,MAAM,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IAE/B,IAAI,IAAA,+BAAa,EAAC,MAAM,CAAC,IAAI,IAAA,+BAAa,EAAC,MAAM,CAAC,EAAE;QAClD,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE;YACrC,
|
|
1
|
+
{"version":3,"file":"merge.js","sourceRoot":"","sources":["../../src/utils/merge.ts"],"names":[],"mappings":";;AACA,uDAAkD;AAElD;;;;;GAKG;AACH,SAAwB,KAAK,CAC3B,MAAS,EACT,GAAG,OAAU;IAEb,IAAI,CAAC,OAAO,CAAC,MAAM;QAAE,OAAO,MAA4C,CAAC;IACzE,MAAM,MAAM,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IAE/B,IAAI,IAAA,+BAAa,EAAC,MAAM,CAAC,IAAI,IAAA,+BAAa,EAAC,MAAM,CAAC,EAAE;QAClD,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE;YACrC,MAAM,UAAU,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;YAC/B,IAAI,IAAA,+BAAa,EAAC,UAAU,CAAC,EAAE;gBAC7B,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC;oBAAE,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;gBACvD,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,UAAU,CAAC,CAAC;aAChC;iBAAM;gBACL,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;aAC/C;SACF;KACF;IAED,OAAO,KAAK,CAAC,MAAM,EAAE,GAAG,OAAO,CAAC,CAAC;AACnC,CAAC;AApBD,wBAoBC"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import Relator from '../classes/relator';
|
|
2
2
|
import { SerializerOptions } from '../interfaces/serializer.interface';
|
|
3
3
|
import { Dictionary } from '../types/global.types';
|
|
4
|
-
export declare function recurseRelators(data: any[], relators: Record<string, Relator<any>>,
|
|
5
|
-
export declare function normalizeRelators<T
|
|
6
|
-
export declare class Helpers<PrimaryType> {
|
|
4
|
+
export declare function recurseRelators(data: any[], relators: Record<string, Relator<any>>, include: number | string[] | undefined, keys: string[], relatorDataCache?: Map<Relator<any>, Dictionary<any>[]>): Promise<any[]>;
|
|
5
|
+
export declare function normalizeRelators<T extends Dictionary<any>>(relators: SerializerOptions<T>['relators']): Record<string, Relator<T, any>> | undefined;
|
|
6
|
+
export declare class Helpers<PrimaryType extends Dictionary<any> = any> {
|
|
7
7
|
projectAttributes: (data: PrimaryType) => Partial<PrimaryType> | undefined;
|
|
8
8
|
relators: Record<string, Relator<PrimaryType, any>> | undefined;
|
|
9
9
|
constructor(options: SerializerOptions<PrimaryType>);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serializer.utils.d.ts","sourceRoot":"","sources":["../../src/utils/serializer.utils.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,oBAAoB,CAAC;AACzC,OAAO,EAAE,iBAAiB,EAAE,MAAM,oCAAoC,CAAC;AACvE,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAEnD,wBAAsB,eAAe,CACnC,IAAI,EAAE,GAAG,EAAE,EACX,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,EACtC,
|
|
1
|
+
{"version":3,"file":"serializer.utils.d.ts","sourceRoot":"","sources":["../../src/utils/serializer.utils.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,oBAAoB,CAAC;AACzC,OAAO,EAAE,iBAAiB,EAAE,MAAM,oCAAoC,CAAC;AACvE,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAEnD,wBAAsB,eAAe,CACnC,IAAI,EAAE,GAAG,EAAE,EACX,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,EACtC,OAAO,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,SAAS,EACtC,IAAI,EAAE,MAAM,EAAE,EACd,gBAAgB,CAAC,EAAE,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC,kBAuExD;AAED,wBAAgB,iBAAiB,CAAC,CAAC,SAAS,UAAU,CAAC,GAAG,CAAC,EACzD,QAAQ,EAAE,iBAAiB,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,+CAiB3C;AAED,qBAAa,OAAO,CAAC,WAAW,SAAS,UAAU,CAAC,GAAG,CAAC,GAAG,GAAG;IACrD,iBAAiB,EAAE,CAAC,IAAI,EAAE,WAAW,KAAK,OAAO,CAAC,WAAW,CAAC,GAAG,SAAS,CAAC;IAC3E,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC,GAAG,SAAS,CAAC;gBACpD,OAAO,EAAE,iBAAiB,CAAC,WAAW,CAAC;CA0C3D"}
|
|
@@ -5,8 +5,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.Helpers = exports.normalizeRelators = exports.recurseRelators = void 0;
|
|
7
7
|
const relator_1 = __importDefault(require("../classes/relator"));
|
|
8
|
-
async function recurseRelators(data, relators,
|
|
8
|
+
async function recurseRelators(data, relators, include, keys, relatorDataCache) {
|
|
9
9
|
const included = [];
|
|
10
|
+
let depth = typeof include === 'number'
|
|
11
|
+
? include
|
|
12
|
+
: Array.isArray(include)
|
|
13
|
+
? Math.max(...include.map((i) => i.split('.').length))
|
|
14
|
+
: 0;
|
|
10
15
|
let curRelatorDataCache = relatorDataCache || new Map();
|
|
11
16
|
// Required to support backwards compatability where the first dataCache may
|
|
12
17
|
// not be passed in. All subsequent iterations will contain a dataCache
|
|
@@ -22,18 +27,36 @@ async function recurseRelators(data, relators, depth, keys, relatorDataCache) {
|
|
|
22
27
|
}
|
|
23
28
|
}
|
|
24
29
|
}
|
|
30
|
+
let currentDepth = 0;
|
|
25
31
|
while (depth-- > 0 && curRelatorDataCache.size > 0) {
|
|
26
32
|
const newRelatorDataCache = new Map();
|
|
33
|
+
const includeFields = Array.isArray(include)
|
|
34
|
+
? include
|
|
35
|
+
.map((i) => i.split('.'))
|
|
36
|
+
.filter((i) => i[currentDepth])
|
|
37
|
+
.map((i) => ({ field: i[currentDepth], hasMore: i.length > currentDepth + 1 }))
|
|
38
|
+
: undefined;
|
|
27
39
|
for (const [relator, cache] of curRelatorDataCache) {
|
|
28
40
|
for (let i = 0; i < cache.length; i++) {
|
|
29
|
-
const
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
41
|
+
const shouldBuildRelatedCache = (!includeFields ||
|
|
42
|
+
includeFields?.filter((i) => i.field === relator.relatedName)?.[i]?.hasMore) ??
|
|
43
|
+
false;
|
|
44
|
+
const resource = await relator.getRelatedResource(cache[i], undefined, undefined,
|
|
45
|
+
// Only build the cache for the nexty iteration if needed.
|
|
46
|
+
shouldBuildRelatedCache ? newRelatorDataCache : undefined);
|
|
47
|
+
// Include if,
|
|
48
|
+
// - includeFields == undefined
|
|
49
|
+
// - includeFields has entry where field = relatedName
|
|
50
|
+
if (!includeFields || includeFields.map((i) => i.field).includes(relator.relatedName)) {
|
|
51
|
+
const key = resource.getKey();
|
|
52
|
+
if (!keys.includes(key)) {
|
|
53
|
+
keys.push(key);
|
|
54
|
+
included.push(resource);
|
|
55
|
+
}
|
|
34
56
|
}
|
|
35
57
|
}
|
|
36
58
|
}
|
|
59
|
+
currentDepth++;
|
|
37
60
|
curRelatorDataCache = newRelatorDataCache;
|
|
38
61
|
}
|
|
39
62
|
return included;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serializer.utils.js","sourceRoot":"","sources":["../../src/utils/serializer.utils.ts"],"names":[],"mappings":";;;;;;AAAA,iEAAyC;AAIlC,KAAK,UAAU,eAAe,CACnC,IAAW,EACX,QAAsC,EACtC,
|
|
1
|
+
{"version":3,"file":"serializer.utils.js","sourceRoot":"","sources":["../../src/utils/serializer.utils.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED