ts-japi 1.9.0 → 1.9.1
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/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,12 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
+
## [1.9.1](https://github.com/mathematic-inc/ts-japi/compare/v1.9.0...v1.9.1) (2023-10-11)
|
|
4
|
+
|
|
5
|
+
|
|
6
|
+
### Bug Fixes
|
|
7
|
+
|
|
8
|
+
* fix logic where nested includes were not calculated correctly. Fixes [#68](https://github.com/mathematic-inc/ts-japi/issues/68) ([#69](https://github.com/mathematic-inc/ts-japi/issues/69)) ([701a7e6](https://github.com/mathematic-inc/ts-japi/commit/701a7e61d8239abbe54ba88bcf65f8fb7552ad79))
|
|
9
|
+
|
|
3
10
|
## [1.9.0](https://github.com/mathematic-inc/ts-japi/compare/v1.8.1...v1.9.0) (2023-09-04)
|
|
4
11
|
|
|
5
12
|
|
|
@@ -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,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,
|
|
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,kBAyExD;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"}
|
|
@@ -39,13 +39,15 @@ async function recurseRelators(data, relators, include, keys, relatorDataCache)
|
|
|
39
39
|
for (const [relator, cache] of curRelatorDataCache) {
|
|
40
40
|
for (let i = 0; i < cache.length; i++) {
|
|
41
41
|
const shouldBuildRelatedCache = (!includeFields ||
|
|
42
|
-
includeFields
|
|
42
|
+
includeFields
|
|
43
|
+
?.filter((i) => i.field === relator.relatedName)
|
|
44
|
+
?.some((i) => i.hasMore)) ??
|
|
43
45
|
false;
|
|
44
46
|
const resource = await relator.getRelatedResource(cache[i], undefined, undefined,
|
|
45
|
-
// Only build the cache for the
|
|
47
|
+
// Only build the cache for the next iteration if needed.
|
|
46
48
|
shouldBuildRelatedCache ? newRelatorDataCache : undefined);
|
|
47
49
|
// Include if,
|
|
48
|
-
// - includeFields
|
|
50
|
+
// - includeFields !== undefined
|
|
49
51
|
// - includeFields has entry where field = relatedName
|
|
50
52
|
if (!includeFields || includeFields.map((i) => i.field).includes(relator.relatedName)) {
|
|
51
53
|
const key = resource.getKey();
|
|
@@ -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,OAAsC,EACtC,IAAc,EACd,gBAAuD;IAEvD,MAAM,QAAQ,GAAU,EAAE,CAAC;IAC3B,IAAI,KAAK,GACP,OAAO,OAAO,KAAK,QAAQ;QACzB,CAAC,CAAC,OAAO;QACT,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC;YACxB,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC;YACtD,CAAC,CAAC,CAAC,CAAC;IAER,IAAI,mBAAmB,GAAG,gBAAgB,IAAI,IAAI,GAAG,EAAmC,CAAC;IAEzF,4EAA4E;IAC5E,uEAAuE;IACvE,IAAI,CAAC,gBAAgB,IAAI,KAAK,GAAG,CAAC,EAAE;QAClC,KAAK,MAAM,IAAI,IAAI,QAAQ,EAAE;YAC3B,MAAM,KAAK,GAAG,mBAAmB,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,CAAC;YAC5D,mBAAmB,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,KAAK,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"serializer.utils.js","sourceRoot":"","sources":["../../src/utils/serializer.utils.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED