@loopback/repository 7.0.0 → 7.0.2

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.
Files changed (4) hide show
  1. package/dist/relations/has-many/has-many-through.inclusion-resolver.js +2 -2
  2. package/dist/relations/has-many/has-many-through.inclusion-resolver.js.map +1 -1
  3. package/package.json +11 -11
  4. package/src/relations/has-many/has-many-through.inclusion-resolver.ts +5 -2
package/dist/relations/has-many/has-many-through.inclusion-resolver.js CHANGED
@@ -159,7 +159,7 @@ function createHasManyThroughInclusionResolver(meta, getThroughRepo, getTargetRe
159
159
  ...options,
160
160
  isThroughModelInclude: true,
161
161
  });
162
- const targetEntityIds = targetEntityList.map(targetEntity => targetEntity[targetKey]);
162
+ const targetEntityIds = targetEntityList.map(targetEntity => { var _a, _b; return (_b = (_a = targetEntity[targetKey]) === null || _a === void 0 ? void 0 : _a.toString()) !== null && _b !== void 0 ? _b : targetEntity[targetKey]; });
163
163
  const targetEntityMap = Object.fromEntries(targetEntityList.map(x => [
164
164
  x[targetKey],
165
165
  omitTargetKeyFromFields ? lodash_1.default.omit(x, [targetKey]) : x,
@@ -167,7 +167,7 @@ function createHasManyThroughInclusionResolver(meta, getThroughRepo, getTargetRe
167
167
  // convert from through entities to the target entities
168
168
  for (const entityList of throughResult) {
169
169
  if (entityList) {
170
- const relatedIds = entityList.map(x => x[throughKeyTo]);
170
+ const relatedIds = entityList.map(x => { var _a, _b; return (_b = (_a = x[throughKeyTo]) === null || _a === void 0 ? void 0 : _a.toString()) !== null && _b !== void 0 ? _b : x[throughKeyTo]; });
171
171
  // Use the order of the original result set & apply limit
172
172
  const sortedIds = lodash_1.default.intersection(targetEntityIds, relatedIds).slice(0, (_b = scope === null || scope === void 0 ? void 0 : scope.limit) !== null && _b !== void 0 ? _b : entityList.length);
173
173
  // Make each result its own instance to avoid shenanigans by reference
package/dist/relations/has-many/has-many-through.inclusion-resolver.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"has-many-through.inclusion-resolver.js","sourceRoot":"","sources":["../../../src/relations/has-many/has-many-through.inclusion-resolver.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"has-many-through.inclusion-resolver.js","sourceRoot":"","sources":["../../../src/relations/has-many/has-many-through.inclusion-resolver.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@loopback/repository",
3
3
  "description": "Define and implement a common set of interfaces for interacting with databases",
4
- "version": "7.0.0",
4
+ "version": "7.0.2",
5
5
  "license": "MIT",
6
6
  "main": "dist/index.js",
7
7
  "types": "dist/index.d.ts",
@@ -13,7 +13,7 @@
13
13
  "directory": "packages/repository"
14
14
  },
15
15
  "engines": {
16
- "node": "18 || 20"
16
+ "node": "18 || 20 || 22"
17
17
  },
18
18
  "scripts": {
19
19
  "acceptance": "lb-mocha \"dist/__tests__/acceptance/**/*.js\"",
@@ -36,22 +36,22 @@
36
36
  "@loopback/core": "^6.0.0"
37
37
  },
38
38
  "dependencies": {
39
- "@loopback/filter": "^5.0.0",
39
+ "@loopback/filter": "^5.0.2",
40
40
  "@types/debug": "^4.1.12",
41
41
  "debug": "^4.3.4",
42
42
  "lodash": "^4.17.21",
43
- "loopback-datasource-juggler": "^5.0.6",
43
+ "loopback-datasource-juggler": "^5.0.9",
44
44
  "tslib": "^2.6.2"
45
45
  },
46
46
  "devDependencies": {
47
- "@loopback/build": "^11.0.0",
48
- "@loopback/core": "^6.0.0",
49
- "@loopback/eslint-config": "^15.0.0",
50
- "@loopback/testlab": "^7.0.0",
47
+ "@loopback/build": "^11.0.2",
48
+ "@loopback/core": "^6.0.2",
49
+ "@loopback/eslint-config": "^15.0.2",
50
+ "@loopback/testlab": "^7.0.2",
51
51
  "@types/json-schema": "^7.0.15",
52
- "@types/lodash": "^4.14.202",
53
- "@types/node": "^16.18.86",
52
+ "@types/lodash": "^4.17.3",
53
+ "@types/node": "^16.18.96",
54
54
  "bson": "5.5.1"
55
55
  },
56
- "gitHead": "bb4864f7405492d9c86c7db6e714542a292a8790"
56
+ "gitHead": "06b27e1b47cea48b54280e5590bb165e11fbeb10"
57
57
  }
package/src/relations/has-many/has-many-through.inclusion-resolver.ts CHANGED
@@ -251,7 +251,8 @@ export function createHasManyThroughInclusionResolver<
251
251
  );
252
252
 
253
253
  const targetEntityIds = targetEntityList.map(
254
- targetEntity => targetEntity[targetKey],
254
+ targetEntity =>
255
+ targetEntity[targetKey]?.toString() ?? targetEntity[targetKey],
255
256
  );
256
257
 
257
258
  const targetEntityMap = Object.fromEntries(
@@ -264,7 +265,9 @@ export function createHasManyThroughInclusionResolver<
264
265
  // convert from through entities to the target entities
265
266
  for (const entityList of throughResult) {
266
267
  if (entityList) {
267
- const relatedIds = entityList.map(x => x[throughKeyTo]);
268
+ const relatedIds = entityList.map(
269
+ x => x[throughKeyTo]?.toString() ?? x[throughKeyTo],
270
+ );
268
271
 
269
272
  // Use the order of the original result set & apply limit
270
273
  const sortedIds = _.intersection(