@goatlab/fluent 0.9.9 → 0.9.10
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/dist/BaseConnector.d.ts +4 -4
- package/dist/BaseConnector.js +47 -27
- package/dist/BaseConnector.js.map +1 -1
- package/dist/Fluent.d.ts +7 -9
- package/dist/Fluent.js +36 -18
- package/dist/Fluent.js.map +1 -1
- package/dist/TypeOrmConnector/TypeOrmConnector.d.ts +10 -7
- package/dist/TypeOrmConnector/TypeOrmConnector.js +157 -106
- package/dist/TypeOrmConnector/TypeOrmConnector.js.map +1 -1
- package/dist/TypeOrmConnector/queryBuilder/mongodb/getMongoBaseAggregations.d.ts +2 -2
- package/dist/TypeOrmConnector/queryBuilder/mongodb/getMongoBaseAggregations.js +14 -8
- package/dist/TypeOrmConnector/queryBuilder/mongodb/getMongoBaseAggregations.js.map +1 -1
- package/dist/TypeOrmConnector/queryBuilder/mongodb/getMongoFindAggregatedQuery.d.ts +2 -2
- package/dist/TypeOrmConnector/queryBuilder/mongodb/getMongoFindAggregatedQuery.js.map +1 -1
- package/dist/TypeOrmConnector/queryBuilder/mongodb/getMongoOrderBy.js.map +1 -1
- package/dist/TypeOrmConnector/queryBuilder/mongodb/getMongoWhere.d.ts +2 -2
- package/dist/TypeOrmConnector/queryBuilder/mongodb/getMongoWhere.js +99 -181
- package/dist/TypeOrmConnector/queryBuilder/mongodb/getMongoWhere.js.map +1 -1
- package/dist/TypeOrmConnector/queryBuilder/sql/getQueryBuilderWhere.d.ts +2 -2
- package/dist/TypeOrmConnector/queryBuilder/sql/getQueryBuilderWhere.js +40 -40
- package/dist/TypeOrmConnector/queryBuilder/sql/getQueryBuilderWhere.js.map +1 -1
- package/dist/TypeOrmConnector/queryBuilder/sql/getTypeOrmWhere.d.ts +2 -2
- package/dist/TypeOrmConnector/queryBuilder/sql/getTypeOrmWhere.js +96 -41
- package/dist/TypeOrmConnector/queryBuilder/sql/getTypeOrmWhere.js.map +1 -1
- package/dist/TypeOrmConnector/test/advanced/typeOrm.entity.js +5 -1
- package/dist/TypeOrmConnector/test/advanced/typeOrm.entity.js.map +1 -1
- package/dist/TypeOrmConnector/test/basic/goat.entity.js +19 -7
- package/dist/TypeOrmConnector/test/basic/goat.entity.js.map +1 -1
- package/dist/TypeOrmConnector/util/clearEmpties.js +53 -33
- package/dist/TypeOrmConnector/util/clearEmpties.js.map +1 -1
- package/dist/TypeOrmConnector/util/extractConditions.d.ts +4 -2
- package/dist/TypeOrmConnector/util/extractConditions.js +109 -73
- package/dist/TypeOrmConnector/util/extractConditions.js.map +1 -1
- package/dist/TypeOrmConnector/util/extractInclude.js.map +1 -1
- package/dist/TypeOrmConnector/util/extractMetadataFromKeys.js +3 -1
- package/dist/TypeOrmConnector/util/extractMetadataFromKeys.js.map +1 -1
- package/dist/TypeOrmConnector/util/nestQueryResults.js +5 -3
- package/dist/TypeOrmConnector/util/nestQueryResults.js.map +1 -1
- package/dist/core/Loopback/build-schema.d.ts +1 -1
- package/dist/core/Loopback/build-schema.js +33 -27
- package/dist/core/Loopback/build-schema.js.map +1 -1
- package/dist/core/Loopback/common-types.d.ts +1 -3
- package/dist/core/Loopback/common-types.js.map +1 -1
- package/dist/core/Loopback/json-to-schema.js +6 -5
- package/dist/core/Loopback/json-to-schema.js.map +1 -1
- package/dist/core/Loopback/mapValues.js +704 -584
- package/dist/core/Loopback/model.d.ts +2 -3
- package/dist/core/Loopback/model.js +26 -18
- package/dist/core/Loopback/model.js.map +1 -1
- package/dist/core/Loopback/query.js +36 -30
- package/dist/core/Loopback/query.js.map +1 -1
- package/dist/core/Loopback/relation.types.d.ts +1 -1
- package/dist/core/Loopback/type-resolver.js +6 -3
- package/dist/core/Loopback/type-resolver.js.map +1 -1
- package/dist/core/Nestjs/applyDecorators.d.ts +1 -1
- package/dist/core/Nestjs/types/common.d.ts +7 -7
- package/dist/core/Nestjs/types/common.js +4 -4
- package/dist/core/Nestjs/types/decorators/api-hide-property.decorator.js +1 -1
- package/dist/core/Nestjs/types/decorators/api-hide-property.decorator.js.map +1 -1
- package/dist/core/Nestjs/types/decorators/api-property.decorator.js +1 -1
- package/dist/core/Nestjs/types/decorators/api-property.decorator.js.map +1 -1
- package/dist/core/Nestjs/types/decorators/apply-is-optional.decorator.d.ts +1 -1
- package/dist/core/Nestjs/types/decorators/apply-is-optional.decorator.js +1 -1
- package/dist/core/Nestjs/types/decorators/apply-is-optional.decorator.js.map +1 -1
- package/dist/core/Nestjs/types/decorators/args-type.decorator.js +4 -4
- package/dist/core/Nestjs/types/decorators/args-type.decorator.js.map +1 -1
- package/dist/core/Nestjs/types/decorators/create-property.decorator.d.ts +1 -1
- package/dist/core/Nestjs/types/decorators/create-property.decorator.js.map +1 -1
- package/dist/core/Nestjs/types/decorators/directive.decorator.js +1 -1
- package/dist/core/Nestjs/types/decorators/directive.decorator.js.map +1 -1
- package/dist/core/Nestjs/types/decorators/extensions.decorator.js.map +1 -1
- package/dist/core/Nestjs/types/decorators/field.decorator.d.ts +1 -1
- package/dist/core/Nestjs/types/decorators/field.decorator.js +3 -3
- package/dist/core/Nestjs/types/decorators/field.decorator.js.map +1 -1
- package/dist/core/Nestjs/types/decorators/input-type.decorator.js +3 -3
- package/dist/core/Nestjs/types/decorators/input-type.decorator.js.map +1 -1
- package/dist/core/Nestjs/types/decorators/interface-type.decorator.js +3 -3
- package/dist/core/Nestjs/types/decorators/interface-type.decorator.js.map +1 -1
- package/dist/core/Nestjs/types/decorators/partial-type.helper.js +1 -1
- package/dist/core/Nestjs/types/decorators/partial-type.helper.js.map +1 -1
- package/dist/core/Nestjs/types/interfaces/add-class-type-metadata.util.js.map +1 -1
- package/dist/core/Nestjs/types/interfaces/complexity.interface.d.ts +1 -1
- package/dist/core/Nestjs/types/interfaces/field-middleware.interface.d.ts +2 -4
- package/dist/core/Nestjs/types/interfaces/return-type-func.interface.d.ts +1 -1
- package/dist/core/Nestjs/types/interfaces/schema-object-metadata.interface.d.ts +2 -2
- package/dist/core/Nestjs/types/lazy-metadata.storage.d.ts +4 -4
- package/dist/core/Nestjs/types/lazy-metadata.storage.js +2 -3
- package/dist/core/Nestjs/types/lazy-metadata.storage.js.map +1 -1
- package/dist/core/Nestjs/types/metadata/class.metadata.d.ts +1 -1
- package/dist/core/Nestjs/types/metadata/directive.metadata.d.ts +1 -1
- package/dist/core/Nestjs/types/metadata/extensions.metadata.d.ts +1 -1
- package/dist/core/Nestjs/types/metadata/property.metadata.d.ts +2 -2
- package/dist/core/Nestjs/types/metadata/resolver.metadata.d.ts +6 -6
- package/dist/core/Nestjs/types/object-type.decorator.js +4 -4
- package/dist/core/Nestjs/types/object-type.decorator.js.map +1 -1
- package/dist/core/Nestjs/types/omit-type.d.ts +1 -1
- package/dist/core/Nestjs/types/omit-type.js +1 -1
- package/dist/core/Nestjs/types/omit-type.js.map +1 -1
- package/dist/core/Nestjs/types/reflection.utils.js.map +1 -1
- package/dist/core/Nestjs/types/set-metadata.decorator.js +1 -1
- package/dist/core/Nestjs/types/set-metadata.decorator.js.map +1 -1
- package/dist/core/Nestjs/types/type-metadata.storage.d.ts +4 -1
- package/dist/core/Nestjs/types/type-metadata.storage.js +45 -33
- package/dist/core/Nestjs/types/type-metadata.storage.js.map +1 -1
- package/dist/core/Nestjs/types/utils/enum.utils.js +2 -2
- package/dist/core/Nestjs/types/utils/enum.utils.js.map +1 -1
- package/dist/core/Nestjs/types/utils/get-fields-and-decorator.util.js +6 -6
- package/dist/core/Nestjs/types/utils/get-fields-and-decorator.util.js.map +1 -1
- package/dist/core/types.d.ts +5 -5
- package/dist/core/types.js +5 -5
- package/dist/core/types.js.map +1 -1
- package/dist/decorators.d.ts +6 -6
- package/dist/decorators.js +10 -10
- package/dist/decorators.js.map +1 -1
- package/dist/index.d.ts +20 -16
- package/dist/index.js +29 -23
- package/dist/index.js.map +1 -1
- package/dist/loadRelations.d.ts +1 -1
- package/dist/loadRelations.js +129 -117
- package/dist/loadRelations.js.map +1 -1
- package/dist/outputKeys.js.map +1 -1
- package/dist/testing/genericUnifiedTestSuite.js +5 -6
- package/dist/testing/genericUnifiedTestSuite.js.map +1 -1
- package/dist/testing/unifiedTestFactory.d.ts +2 -2
- package/dist/testing/unifiedTestFactory.js +4 -7
- package/dist/testing/unifiedTestFactory.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/dist/types.d.ts +18 -18
- package/dist/types.js +16 -16
- package/dist/types.js.map +1 -1
- package/package.json +7 -7
|
@@ -8,9 +8,11 @@ const isAnyObject_1 = require("./isAnyObject");
|
|
|
8
8
|
*/
|
|
9
9
|
function flattenWithTypes(obj, prefix = '', result = {}) {
|
|
10
10
|
for (const key in obj) {
|
|
11
|
-
if (
|
|
11
|
+
if (Object.hasOwn(obj, key)) {
|
|
12
12
|
const newKey = prefix ? `${prefix}.${key}` : key;
|
|
13
|
-
if (obj[key] !== null &&
|
|
13
|
+
if (obj[key] !== null &&
|
|
14
|
+
typeof obj[key] === 'object' &&
|
|
15
|
+
!Array.isArray(obj[key])) {
|
|
14
16
|
flattenWithTypes(obj[key], newKey, result);
|
|
15
17
|
}
|
|
16
18
|
else {
|
|
@@ -21,12 +23,6 @@ function flattenWithTypes(obj, prefix = '', result = {}) {
|
|
|
21
23
|
}
|
|
22
24
|
return result;
|
|
23
25
|
}
|
|
24
|
-
/**
|
|
25
|
-
* Transforms the nested object WHERE clause into an
|
|
26
|
-
* Array of clearly defined conditions
|
|
27
|
-
* @param conditions
|
|
28
|
-
* @returns
|
|
29
|
-
*/
|
|
30
26
|
const extractConditions = (conditions) => {
|
|
31
27
|
const accumulatedClauses = [];
|
|
32
28
|
if (!conditions) {
|
|
@@ -36,72 +32,112 @@ const extractConditions = (conditions) => {
|
|
|
36
32
|
if (!clause) {
|
|
37
33
|
continue;
|
|
38
34
|
}
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
if ((0, isAnyObject_1.isAnyObject)(value)) {
|
|
42
|
-
const initialKey = el;
|
|
43
|
-
// Use a custom flatten that preserves types
|
|
44
|
-
const flatten = flattenWithTypes(value);
|
|
45
|
-
for (const key of Object.keys(flatten)) {
|
|
46
|
-
// Remove .# from keys when we have an array in the flattened object
|
|
47
|
-
const transformedKey = key.replace(new RegExp('.[0-9]', 'g'), '');
|
|
48
|
-
if (types_1.LogicOperator[transformedKey]) {
|
|
49
|
-
if (types_1.LogicOperator[transformedKey] === types_1.LogicOperator.in ||
|
|
50
|
-
types_1.LogicOperator[transformedKey] === types_1.LogicOperator.notIn) {
|
|
51
|
-
// The IN operator accepts an array, therefore we need the full array as a value
|
|
52
|
-
accumulatedClauses.push({
|
|
53
|
-
operator: types_1.LogicOperator[transformedKey],
|
|
54
|
-
element: `${initialKey}`,
|
|
55
|
-
value: value[transformedKey]
|
|
56
|
-
});
|
|
57
|
-
}
|
|
58
|
-
else {
|
|
59
|
-
accumulatedClauses.push({
|
|
60
|
-
operator: types_1.LogicOperator[transformedKey],
|
|
61
|
-
element: `${initialKey}`,
|
|
62
|
-
value: flatten[key]
|
|
63
|
-
});
|
|
64
|
-
}
|
|
65
|
-
}
|
|
66
|
-
else if (transformedKey.includes('.')) {
|
|
67
|
-
const op = key.split('.').slice(-1).pop();
|
|
68
|
-
if (!op) {
|
|
69
|
-
continue;
|
|
70
|
-
}
|
|
71
|
-
if (types_1.LogicOperator[op]) {
|
|
72
|
-
accumulatedClauses.push({
|
|
73
|
-
operator: types_1.LogicOperator[op],
|
|
74
|
-
element: `${initialKey}.${key.replace(`.${op}`, '')}`,
|
|
75
|
-
value: flatten[key]
|
|
76
|
-
});
|
|
77
|
-
}
|
|
78
|
-
else {
|
|
79
|
-
accumulatedClauses.push({
|
|
80
|
-
operator: types_1.LogicOperator.equals,
|
|
81
|
-
element: `${initialKey}.${key}`,
|
|
82
|
-
value: flatten[key]
|
|
83
|
-
});
|
|
84
|
-
}
|
|
85
|
-
}
|
|
86
|
-
else {
|
|
87
|
-
accumulatedClauses.push({
|
|
88
|
-
operator: types_1.LogicOperator.equals,
|
|
89
|
-
element: `${initialKey}.${transformedKey}`,
|
|
90
|
-
value: flatten[key]
|
|
91
|
-
});
|
|
92
|
-
}
|
|
93
|
-
}
|
|
94
|
-
}
|
|
95
|
-
else {
|
|
96
|
-
accumulatedClauses.push({
|
|
97
|
-
operator: types_1.LogicOperator.equals,
|
|
98
|
-
element: el,
|
|
99
|
-
value
|
|
100
|
-
});
|
|
101
|
-
}
|
|
102
|
-
}
|
|
35
|
+
const clauseConditions = extractClauseConditions(clause);
|
|
36
|
+
accumulatedClauses.push(...clauseConditions);
|
|
103
37
|
}
|
|
104
|
-
return accumulatedClauses
|
|
38
|
+
return removeDuplicateConditions(accumulatedClauses);
|
|
105
39
|
};
|
|
106
40
|
exports.extractConditions = extractConditions;
|
|
41
|
+
function extractClauseConditions(clause) {
|
|
42
|
+
const conditions = [];
|
|
43
|
+
for (const element of Object.keys(clause)) {
|
|
44
|
+
const value = clause[element];
|
|
45
|
+
if ((0, isAnyObject_1.isAnyObject)(value)) {
|
|
46
|
+
const objectConditions = extractObjectConditions(element, value);
|
|
47
|
+
conditions.push(...objectConditions);
|
|
48
|
+
}
|
|
49
|
+
else {
|
|
50
|
+
conditions.push({
|
|
51
|
+
operator: types_1.LogicOperator.Equals,
|
|
52
|
+
element,
|
|
53
|
+
value
|
|
54
|
+
});
|
|
55
|
+
}
|
|
56
|
+
}
|
|
57
|
+
return conditions;
|
|
58
|
+
}
|
|
59
|
+
function extractObjectConditions(initialKey, value) {
|
|
60
|
+
const conditions = [];
|
|
61
|
+
const flatten = flattenWithTypes(value);
|
|
62
|
+
for (const key of Object.keys(flatten)) {
|
|
63
|
+
const transformedKey = key.replace(/.[0-9]/g, '');
|
|
64
|
+
const condition = createConditionFromKey(initialKey, key, transformedKey, value, flatten);
|
|
65
|
+
if (condition) {
|
|
66
|
+
conditions.push(condition);
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
return conditions;
|
|
70
|
+
}
|
|
71
|
+
function createConditionFromKey(initialKey, key, transformedKey, originalValue, flatten) {
|
|
72
|
+
// Handle direct operator
|
|
73
|
+
// Check if transformedKey is a value in LogicOperator enum
|
|
74
|
+
const operatorValue = Object.values(types_1.LogicOperator).find(val => val === transformedKey);
|
|
75
|
+
if (operatorValue) {
|
|
76
|
+
return createOperatorCondition(initialKey, transformedKey, key, originalValue, flatten);
|
|
77
|
+
}
|
|
78
|
+
// Handle nested operator
|
|
79
|
+
if (transformedKey.includes('.')) {
|
|
80
|
+
return createNestedCondition(initialKey, key, flatten);
|
|
81
|
+
}
|
|
82
|
+
// Default to equals operator
|
|
83
|
+
return {
|
|
84
|
+
operator: types_1.LogicOperator.Equals,
|
|
85
|
+
element: `${initialKey}.${transformedKey}`,
|
|
86
|
+
value: flatten[key]
|
|
87
|
+
};
|
|
88
|
+
}
|
|
89
|
+
function createOperatorCondition(initialKey, operatorKey, flatKey, originalValue, flatten) {
|
|
90
|
+
// Find the operator by its value (e.g., 'in' -> LogicOperator.In)
|
|
91
|
+
const operatorEntry = Object.entries(types_1.LogicOperator).find(([_key, value]) => value === operatorKey);
|
|
92
|
+
if (!operatorEntry) {
|
|
93
|
+
throw new Error(`Unknown operator: ${operatorKey}`);
|
|
94
|
+
}
|
|
95
|
+
const operator = operatorEntry[1];
|
|
96
|
+
// Special handling for IN and NOT IN operators
|
|
97
|
+
if (operator === types_1.LogicOperator.In || operator === types_1.LogicOperator.NotIn) {
|
|
98
|
+
return {
|
|
99
|
+
operator,
|
|
100
|
+
element: initialKey,
|
|
101
|
+
value: originalValue[operatorKey]
|
|
102
|
+
};
|
|
103
|
+
}
|
|
104
|
+
return {
|
|
105
|
+
operator,
|
|
106
|
+
element: initialKey,
|
|
107
|
+
value: flatten[flatKey]
|
|
108
|
+
};
|
|
109
|
+
}
|
|
110
|
+
function createNestedCondition(initialKey, key, flatten) {
|
|
111
|
+
const parts = key.split('.');
|
|
112
|
+
const possibleOperator = parts[parts.length - 1];
|
|
113
|
+
if (!possibleOperator) {
|
|
114
|
+
return null;
|
|
115
|
+
}
|
|
116
|
+
// Check if possibleOperator is a value in LogicOperator enum
|
|
117
|
+
const operatorEntry = Object.entries(types_1.LogicOperator).find(([_key, value]) => value === possibleOperator);
|
|
118
|
+
if (operatorEntry) {
|
|
119
|
+
const elementPath = key.substring(0, key.length - possibleOperator.length - 1);
|
|
120
|
+
return {
|
|
121
|
+
operator: operatorEntry[1],
|
|
122
|
+
element: `${initialKey}.${elementPath}`,
|
|
123
|
+
value: flatten[key]
|
|
124
|
+
};
|
|
125
|
+
}
|
|
126
|
+
return {
|
|
127
|
+
operator: types_1.LogicOperator.Equals,
|
|
128
|
+
element: `${initialKey}.${key}`,
|
|
129
|
+
value: flatten[key]
|
|
130
|
+
};
|
|
131
|
+
}
|
|
132
|
+
function removeDuplicateConditions(conditions) {
|
|
133
|
+
const seen = new Set();
|
|
134
|
+
return conditions.filter(condition => {
|
|
135
|
+
const key = JSON.stringify(condition);
|
|
136
|
+
if (seen.has(key)) {
|
|
137
|
+
return false;
|
|
138
|
+
}
|
|
139
|
+
seen.add(key);
|
|
140
|
+
return true;
|
|
141
|
+
});
|
|
142
|
+
}
|
|
107
143
|
//# sourceMappingURL=extractConditions.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"extractConditions.js","sourceRoot":"","sources":["../../../src/TypeOrmConnector/util/extractConditions.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"extractConditions.js","sourceRoot":"","sources":["../../../src/TypeOrmConnector/util/extractConditions.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"extractInclude.js","sourceRoot":"","sources":["../../../src/TypeOrmConnector/util/extractInclude.ts"],"names":[],"mappings":";;;AAAA,gDAA2C;AAGpC,MAAM,cAAc,GAAG,
|
|
1
|
+
{"version":3,"file":"extractInclude.js","sourceRoot":"","sources":["../../../src/TypeOrmConnector/util/extractInclude.ts"],"names":[],"mappings":";;;AAAA,gDAA2C;AAGpC,MAAM,cAAc,GAAG,CAAI,OAAmC,EAAE,EAAE;IACvE,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO,SAAS,CAAA;IAClB,CAAC;IACD,MAAM,OAAO,GAAG,kBAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;IACxC,MAAM,gBAAgB,GAAc,EAAE,CAAA;IAEtC,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;QACvC,IAAI,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;YAC5B,MAAM,SAAS,GAAG,GAAG,CAAC,KAAK,CAAC,UAAU,CAAC,CAAA;YAEvC,IAAI,GAAG,GAAG,EAAE,CAAA;YACZ,KAAK,MAAM,MAAM,IAAI,SAAS,EAAE,CAAC;gBAC/B,gBAAgB,CAAC,GAAG,GAAG,GAAG,MAAM,EAAE,CAAC,GAAG,IAAI,CAAA;gBAC1C,GAAG,GAAG,GAAG,GAAG,MAAM,CAAA;YACpB,CAAC;YAED,SAAQ;QACV,CAAC;QAED,gBAAgB,CAAC,GAAG,CAAC,GAAG,IAAI,CAAA;IAC9B,CAAC;IAED,OAAO,gBAAgB,CAAA;AACzB,CAAC,CAAA;AAxBY,QAAA,cAAc,kBAwB1B"}
|
|
@@ -50,7 +50,9 @@ const extractMetadataFromKeys = (keys) => {
|
|
|
50
50
|
relation,
|
|
51
51
|
parentRelation,
|
|
52
52
|
level,
|
|
53
|
-
cardinality: cardinality
|
|
53
|
+
cardinality: cardinality
|
|
54
|
+
?.replace(REGEX_CACHE.xxReplace, '')
|
|
55
|
+
.replace(REGEX_CACHE.tripleSep, '')
|
|
54
56
|
};
|
|
55
57
|
}
|
|
56
58
|
return keyToNestedKeyMap;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"extractMetadataFromKeys.js","sourceRoot":"","sources":["../../../src/TypeOrmConnector/util/extractMetadataFromKeys.ts"],"names":[],"mappings":";;;AAcA,2BAA2B;AAC3B,MAAM,WAAW,GAAG;IAClB,SAAS,EAAE,mBAAmB;IAC9B,SAAS,EAAE,mBAAmB;IAC9B,SAAS,EAAE,MAAM;IACjB,SAAS,EAAE,QAAQ;IACnB,SAAS,EAAE,KAAK;CACjB,CAAA;AAEM,MAAM,uBAAuB,GAAG,
|
|
1
|
+
{"version":3,"file":"extractMetadataFromKeys.js","sourceRoot":"","sources":["../../../src/TypeOrmConnector/util/extractMetadataFromKeys.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.nestQueryResults = void 0;
|
|
4
4
|
const js_utils_1 = require("@goatlab/js-utils");
|
|
5
5
|
const nestQueryResults = (results, keyToNestedKeyMap) => {
|
|
6
|
-
|
|
6
|
+
const nestableObject = {};
|
|
7
7
|
let currentLevel = 0;
|
|
8
8
|
// For each of the keys that we need to map
|
|
9
9
|
for (const key of Object.keys(keyToNestedKeyMap)) {
|
|
@@ -14,7 +14,7 @@ const nestQueryResults = (results, keyToNestedKeyMap) => {
|
|
|
14
14
|
currentLevel = currentLevelMetadata.level;
|
|
15
15
|
// We only group by Ids of the current level
|
|
16
16
|
const grouped = js_utils_1.Arrays.groupBy(results, r => r[key]);
|
|
17
|
-
const
|
|
17
|
+
const _resultCount = Object.keys(grouped)?.length || 0;
|
|
18
18
|
// ForEach Id of the grouped results
|
|
19
19
|
for (const [index, k] of Object.keys(grouped).entries()) {
|
|
20
20
|
const prefixindex = currentLevelMetadata.nestableKey.lastIndexOf('.');
|
|
@@ -27,7 +27,9 @@ const nestQueryResults = (results, keyToNestedKeyMap) => {
|
|
|
27
27
|
// Get value of the id
|
|
28
28
|
nestableObject[`${currentIndex}`] = k;
|
|
29
29
|
}
|
|
30
|
-
|
|
30
|
+
// TODO: Process results when implementation is needed
|
|
31
|
+
for (const _result of results) {
|
|
32
|
+
// Implementation pending
|
|
31
33
|
}
|
|
32
34
|
}
|
|
33
35
|
// currentLevel = currentLevelMetadata.level
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nestQueryResults.js","sourceRoot":"","sources":["../../../src/TypeOrmConnector/util/nestQueryResults.ts"],"names":[],"mappings":";;;AAAA,gDAA0C;AAGnC,MAAM,gBAAgB,GAAG,CAC9B,OAAoB,EACpB,iBAA4B,EACf,EAAE;IACf,
|
|
1
|
+
{"version":3,"file":"nestQueryResults.js","sourceRoot":"","sources":["../../../src/TypeOrmConnector/util/nestQueryResults.ts"],"names":[],"mappings":";;;AAAA,gDAA0C;AAGnC,MAAM,gBAAgB,GAAG,CAC9B,OAAoB,EACpB,iBAA4B,EACf,EAAE;IACf,MAAM,cAAc,GAAG,EAAE,CAAA;IACzB,IAAI,YAAY,GAAG,CAAC,CAAA;IACpB,2CAA2C;IAC3C,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,EAAE,CAAC;QACjD,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;YACzB,SAAQ;QACV,CAAC;QAED,MAAM,oBAAoB,GAAG,iBAAiB,CAAC,GAAG,CAAC,CAAA;QACnD,YAAY,GAAG,oBAAoB,CAAC,KAAK,CAAA;QAEzC,4CAA4C;QAC5C,MAAM,OAAO,GAAc,iBAAM,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAA;QAE/D,MAAM,YAAY,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC,CAAA;QAEtD,oCAAoC;QACpC,KAAK,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC;YACxD,MAAM,WAAW,GAAG,oBAAoB,CAAC,WAAW,CAAC,WAAW,CAAC,GAAG,CAAC,CAAA;YACrE,MAAM,MAAM,GAAG,oBAAoB,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC,EAAE,WAAW,CAAC,CAAA;YACzE,MAAM,YAAY,GAAG,GAAG,MAAM,IAAI,KAAK,IAAI,oBAAoB,CAAC,OAAO,EAAE,CAAA;YACzE,MAAM,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC,CAAA;YAE1B,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAA;YACjC,2BAA2B;YAC3B,IAAI,oBAAoB,CAAC,KAAK,KAAK,YAAY,EAAE,CAAC;gBAChD,sBAAsB;gBACtB,cAAc,CAAC,GAAG,YAAY,EAAE,CAAC,GAAG,CAAC,CAAA;YACvC,CAAC;YAED,sDAAsD;YACtD,KAAK,MAAM,OAAO,IAAI,OAAO,EAAE,CAAC;gBAC9B,yBAAyB;YAC3B,CAAC;QACH,CAAC;QAED,4CAA4C;IAC9C,CAAC;IACD,OAAO,OAAO,CAAA;AAChB,CAAC,CAAA;AA3CY,QAAA,gBAAgB,oBA2C5B"}
|
|
@@ -6,8 +6,8 @@ export interface SchemaObject extends JsonSchema {
|
|
|
6
6
|
};
|
|
7
7
|
$ref?: string;
|
|
8
8
|
}
|
|
9
|
-
import { RelationMetadata } from './relation.types';
|
|
10
9
|
import { PropertyDefinition, PropertyType } from './model';
|
|
10
|
+
import { RelationMetadata } from './relation.types';
|
|
11
11
|
export declare const JSON_SCHEMA_KEY: MetadataAccessor<{
|
|
12
12
|
[key: string]: SchemaObject;
|
|
13
13
|
}, ClassDecorator>;
|
|
@@ -1,4 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
// Copyright IBM Corp. 2018,2020. All Rights Reserved.
|
|
3
|
+
// Node module: @loopback/repository-json-schema
|
|
4
|
+
// This file is licensed under the MIT License.
|
|
5
|
+
// License text available at https://opensource.org/licenses/MIT
|
|
2
6
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
7
|
exports.JSON_SCHEMA_KEY = void 0;
|
|
4
8
|
exports.buildModelCacheKey = buildModelCacheKey;
|
|
@@ -9,14 +13,10 @@ exports.isArrayType = isArrayType;
|
|
|
9
13
|
exports.metaToJsonProperty = metaToJsonProperty;
|
|
10
14
|
exports.getNavigationalPropertyForRelation = getNavigationalPropertyForRelation;
|
|
11
15
|
exports.modelToJsonSchema = modelToJsonSchema;
|
|
12
|
-
|
|
13
|
-
// Node module: @loopback/repository-json-schema
|
|
14
|
-
// This file is licensed under the MIT License.
|
|
15
|
-
// License text available at https://opensource.org/licenses/MIT
|
|
16
|
+
const node_util_1 = require("node:util");
|
|
16
17
|
const metadata_1 = require("@loopback/metadata");
|
|
17
|
-
const util_1 = require("util");
|
|
18
|
-
const type_resolver_1 = require("./type-resolver");
|
|
19
18
|
const metadata_2 = require("./metadata");
|
|
19
|
+
const type_resolver_1 = require("./type-resolver");
|
|
20
20
|
exports.JSON_SCHEMA_KEY = metadata_1.MetadataAccessor.create('loopback:json-schema');
|
|
21
21
|
const debug = console.log;
|
|
22
22
|
/**
|
|
@@ -87,11 +87,12 @@ function getJsonSchemaRef(modelCtor, options) {
|
|
|
87
87
|
const schemaWithDefinitions = getJsonSchema(modelCtor, options);
|
|
88
88
|
const key = schemaWithDefinitions.title;
|
|
89
89
|
// ctor is not a model
|
|
90
|
-
if (!key)
|
|
90
|
+
if (!key) {
|
|
91
91
|
return schemaWithDefinitions;
|
|
92
|
+
}
|
|
92
93
|
const definitions = { ...schemaWithDefinitions.definitions };
|
|
93
94
|
const schema = { ...schemaWithDefinitions };
|
|
94
|
-
|
|
95
|
+
schema.definitions = undefined;
|
|
95
96
|
definitions[key] = schema;
|
|
96
97
|
return {
|
|
97
98
|
$ref: `#/definitions/${key}`,
|
|
@@ -106,9 +107,9 @@ function stringTypeToWrapper(type) {
|
|
|
106
107
|
if (typeof type === 'function') {
|
|
107
108
|
return type;
|
|
108
109
|
}
|
|
109
|
-
|
|
110
|
+
const lowerType = type.toLowerCase();
|
|
110
111
|
let wrapper;
|
|
111
|
-
switch (
|
|
112
|
+
switch (lowerType) {
|
|
112
113
|
case 'number': {
|
|
113
114
|
wrapper = Number;
|
|
114
115
|
break;
|
|
@@ -225,8 +226,9 @@ function getNavigationalPropertyForRelation(relMeta, targetRef) {
|
|
|
225
226
|
throw new Error(`targetsMany attribute missing for ${relMeta.name}`);
|
|
226
227
|
}
|
|
227
228
|
function buildSchemaTitle(ctor, meta, options) {
|
|
228
|
-
if (options.title)
|
|
229
|
+
if (options.title) {
|
|
229
230
|
return options.title;
|
|
231
|
+
}
|
|
230
232
|
const title = meta.title || ctor.name;
|
|
231
233
|
return title + getTitleSuffix(options);
|
|
232
234
|
}
|
|
@@ -251,10 +253,10 @@ function getTitleSuffix(options = {}) {
|
|
|
251
253
|
return suffix;
|
|
252
254
|
}
|
|
253
255
|
function stringifyOptions(modelSettings = {}) {
|
|
254
|
-
return (0,
|
|
255
|
-
depth:
|
|
256
|
-
maxArrayLength:
|
|
257
|
-
breakLength:
|
|
256
|
+
return (0, node_util_1.inspect)(modelSettings, {
|
|
257
|
+
depth: Number.POSITIVE_INFINITY,
|
|
258
|
+
maxArrayLength: Number.POSITIVE_INFINITY,
|
|
259
|
+
breakLength: Number.POSITIVE_INFINITY
|
|
258
260
|
});
|
|
259
261
|
}
|
|
260
262
|
function isEmptyJson(obj) {
|
|
@@ -268,9 +270,9 @@ function isEmptyJson(obj) {
|
|
|
268
270
|
*/
|
|
269
271
|
function getDescriptionSuffix(typeName, rawOptions = {}) {
|
|
270
272
|
const options = { ...rawOptions };
|
|
271
|
-
|
|
273
|
+
options.visited = undefined;
|
|
272
274
|
if (options.optional && !options.optional.length) {
|
|
273
|
-
|
|
275
|
+
options.optional = undefined;
|
|
274
276
|
}
|
|
275
277
|
const type = typeName;
|
|
276
278
|
let tsType = type;
|
|
@@ -306,7 +308,7 @@ function modelToJsonSchema(ctor, jsonSchemaOptions = {}) {
|
|
|
306
308
|
const partial = options.partial && !options.optional.length;
|
|
307
309
|
if (options.partial && !partial) {
|
|
308
310
|
debug('Overriding "partial" option with "optional" option');
|
|
309
|
-
|
|
311
|
+
options.partial = undefined;
|
|
310
312
|
}
|
|
311
313
|
debug('Creating schema for model %s', ctor.name);
|
|
312
314
|
debug('JSON schema options: %o', options);
|
|
@@ -318,8 +320,9 @@ function modelToJsonSchema(ctor, jsonSchemaOptions = {}) {
|
|
|
318
320
|
const meta = modelDef;
|
|
319
321
|
debug('Model settings', meta.settings);
|
|
320
322
|
const title = buildSchemaTitle(ctor, meta, options);
|
|
321
|
-
if (options.visited[title])
|
|
323
|
+
if (options.visited[title]) {
|
|
322
324
|
return options.visited[title];
|
|
325
|
+
}
|
|
323
326
|
const result = { title };
|
|
324
327
|
options.visited[title] = result;
|
|
325
328
|
result.type = 'object';
|
|
@@ -369,16 +372,16 @@ function modelToJsonSchema(ctor, jsonSchemaOptions = {}) {
|
|
|
369
372
|
const propOptions = { ...options };
|
|
370
373
|
if (propOptions.partial !== 'deep') {
|
|
371
374
|
// Do not cascade `partial` to nested properties
|
|
372
|
-
|
|
375
|
+
propOptions.partial = undefined;
|
|
373
376
|
}
|
|
374
377
|
if (propOptions.includeRelations === true) {
|
|
375
378
|
// Do not cascade `includeRelations` to nested properties
|
|
376
|
-
|
|
379
|
+
propOptions.includeRelations = undefined;
|
|
377
380
|
}
|
|
378
381
|
// `title` is the unique identity of a schema,
|
|
379
382
|
// it should be removed from the `options`
|
|
380
383
|
// when generating the relation or property schemas
|
|
381
|
-
|
|
384
|
+
propOptions.title = undefined;
|
|
382
385
|
const propSchema = getJsonSchema(referenceType, propOptions);
|
|
383
386
|
// JSONSchema6Definition allows both boolean and JSONSchema6 types
|
|
384
387
|
if (typeof result.properties[p] !== 'boolean') {
|
|
@@ -401,14 +404,15 @@ function modelToJsonSchema(ctor, jsonSchemaOptions = {}) {
|
|
|
401
404
|
for (const r in meta.relations) {
|
|
402
405
|
result.properties = result.properties ?? {};
|
|
403
406
|
const relMeta = meta.relations[r];
|
|
404
|
-
if (!relMeta)
|
|
407
|
+
if (!relMeta) {
|
|
405
408
|
continue;
|
|
409
|
+
}
|
|
406
410
|
const targetType = (0, type_resolver_1.resolveType)(relMeta.target);
|
|
407
411
|
// `title` is the unique identity of a schema,
|
|
408
412
|
// it should be removed from the `options`
|
|
409
413
|
// when generating the relation or property schemas
|
|
410
414
|
const targetOptions = { ...options };
|
|
411
|
-
|
|
415
|
+
targetOptions.title = undefined;
|
|
412
416
|
const targetSchema = getJsonSchema(targetType, targetOptions);
|
|
413
417
|
const targetRef = { $ref: `#/definitions/${targetSchema.title}` };
|
|
414
418
|
const propDef = getNavigationalPropertyForRelation(relMeta, targetRef);
|
|
@@ -418,17 +422,19 @@ function modelToJsonSchema(ctor, jsonSchemaOptions = {}) {
|
|
|
418
422
|
}
|
|
419
423
|
}
|
|
420
424
|
function includeReferencedSchema(name, schema) {
|
|
421
|
-
if (!schema || !Object.keys(schema).length)
|
|
425
|
+
if (!schema || !Object.keys(schema).length) {
|
|
422
426
|
return;
|
|
427
|
+
}
|
|
423
428
|
// promote nested definition to the top level
|
|
424
429
|
if (result !== schema?.definitions) {
|
|
425
430
|
for (const key in schema.definitions) {
|
|
426
|
-
if (key === title)
|
|
431
|
+
if (key === title) {
|
|
427
432
|
continue;
|
|
433
|
+
}
|
|
428
434
|
result.definitions = result.definitions ?? {};
|
|
429
435
|
result.definitions[key] = schema.definitions[key];
|
|
430
436
|
}
|
|
431
|
-
|
|
437
|
+
schema.definitions = undefined;
|
|
432
438
|
}
|
|
433
439
|
if (result !== schema) {
|
|
434
440
|
result.definitions = result.definitions ?? {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build-schema.js","sourceRoot":"","sources":["../../../src/core/Loopback/build-schema.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"build-schema.js","sourceRoot":"","sources":["../../../src/core/Loopback/build-schema.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common-types.js","sourceRoot":"","sources":["../../../src/core/Loopback/common-types.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,oCAAoC;AACpC,+CAA+C;AAC/C,gEAAgE;;;
|
|
1
|
+
{"version":3,"file":"common-types.js","sourceRoot":"","sources":["../../../src/core/Loopback/common-types.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,oCAAoC;AACpC,+CAA+C;AAC/C,gEAAgE;;;AA2FhE;;;;;GAKG;AACU,QAAA,WAAW,CAAC,mBAAmB,GAAG;IAC7C,IAAI,EAAE,QAAiB,EAAE,gDAAgD;IACzE,KAAK,EAAE,gBAAgB;IACvB,mBAAmB,EAAE,4BAA4B;IACjD,UAAU,EAAE;QACV,KAAK,EAAE;YACL,IAAI,EAAE,QAAiB,CAAC,gDAAgD;SACzE;KACF;CACF,CAAA"}
|
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.jsonToSchemaObject = jsonToSchemaObject;
|
|
4
|
-
exports.jsonOrBooleanToJSON = jsonOrBooleanToJSON;
|
|
5
2
|
// Copyright IBM Corp. 2018,2020. All Rights Reserved.
|
|
6
3
|
// Node module: @loopback/openapi-v3
|
|
7
4
|
// This file is licensed under the MIT License.
|
|
8
5
|
// License text available at https://opensource.org/licenses/MIT
|
|
9
|
-
|
|
6
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
7
|
+
exports.jsonToSchemaObject = jsonToSchemaObject;
|
|
8
|
+
exports.jsonOrBooleanToJSON = jsonOrBooleanToJSON;
|
|
10
9
|
const oas30_1 = require("openapi3-ts/oas30");
|
|
10
|
+
const mapValues_js_1 = require("./mapValues.js");
|
|
11
11
|
/**
|
|
12
12
|
* Converts JSON Schemas into a SchemaObject
|
|
13
13
|
* @param json - JSON Schema to convert from
|
|
@@ -21,8 +21,9 @@ function jsonToSchemaObject(json, visited = new Map()) {
|
|
|
21
21
|
if (schema != null && (0, oas30_1.isSchemaObject)(schema) && schema[converted] === false) {
|
|
22
22
|
return { $ref: `#/components/schemas/${json.title}` };
|
|
23
23
|
}
|
|
24
|
-
if (schema != null)
|
|
24
|
+
if (schema != null) {
|
|
25
25
|
return schema;
|
|
26
|
+
}
|
|
26
27
|
const result = {
|
|
27
28
|
[converted]: false
|
|
28
29
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"json-to-schema.js","sourceRoot":"","sources":["../../../src/core/Loopback/json-to-schema.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"json-to-schema.js","sourceRoot":"","sources":["../../../src/core/Loopback/json-to-schema.ts"],"names":[],"mappings":"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"}
|