@forestadmin/datasource-sequelize 1.8.11 → 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.
|
@@ -6,7 +6,8 @@ export default class AggregationUtils {
|
|
|
6
6
|
private dialect;
|
|
7
7
|
private col;
|
|
8
8
|
private dateAggregationConverter;
|
|
9
|
-
readonly
|
|
9
|
+
readonly _aggregateFieldName = "__aggregate__";
|
|
10
|
+
get aggregateFieldName(): "__aggregate__" | "_0";
|
|
10
11
|
constructor(model: ModelDefined<any, any>);
|
|
11
12
|
private getGroupFieldName;
|
|
12
13
|
quoteField(field: string): string;
|
|
@@ -8,9 +8,18 @@ const date_aggregation_converter_1 = __importDefault(require("./date-aggregation
|
|
|
8
8
|
const serializer_1 = __importDefault(require("./serializer"));
|
|
9
9
|
const un_ambigous_1 = __importDefault(require("./un-ambigous"));
|
|
10
10
|
class AggregationUtils {
|
|
11
|
+
get aggregateFieldName() {
|
|
12
|
+
if (this.model.sequelize.options
|
|
13
|
+
.minifyAliases) {
|
|
14
|
+
// when minifyAliases, sequelize uses _0 as column name instead of __aggregate__
|
|
15
|
+
// fixes https://app.clickup.com/t/86c04wd01
|
|
16
|
+
return '_0';
|
|
17
|
+
}
|
|
18
|
+
return this._aggregateFieldName;
|
|
19
|
+
}
|
|
11
20
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
12
21
|
constructor(model) {
|
|
13
|
-
this.
|
|
22
|
+
this._aggregateFieldName = '__aggregate__';
|
|
14
23
|
this.model = model;
|
|
15
24
|
this.dialect = this.model.sequelize.getDialect();
|
|
16
25
|
this.col = this.model.sequelize.col;
|
|
@@ -78,4 +87,4 @@ class AggregationUtils {
|
|
|
78
87
|
}
|
|
79
88
|
}
|
|
80
89
|
exports.default = AggregationUtils;
|
|
81
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
90
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWdncmVnYXRpb24uanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdXRpbHMvYWdncmVnYXRpb24udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFBQSx3RUFBZ0c7QUFZaEcsOEZBQW9FO0FBQ3BFLDhEQUFzQztBQUN0QyxnRUFBNEM7QUFFNUMsTUFBcUIsZ0JBQWdCO0lBU25DLElBQUksa0JBQWtCO1FBQ3BCLElBQ0csSUFBSSxDQUFDLEtBQUssQ0FBQyxTQUFnRSxDQUFDLE9BQU87YUFDakYsYUFBYSxFQUNoQjtZQUNBLGdGQUFnRjtZQUNoRiw0Q0FBNEM7WUFDNUMsT0FBTyxJQUFJLENBQUM7U0FDYjtRQUVELE9BQU8sSUFBSSxDQUFDLG1CQUFtQixDQUFDO0lBQ2xDLENBQUM7SUFFRCw4REFBOEQ7SUFDOUQsWUFBWSxLQUE2QjtRQWZoQyx3QkFBbUIsR0FBRyxlQUFlLENBQUM7UUFnQjdDLElBQUksQ0FBQyxLQUFLLEdBQUcsS0FBSyxDQUFDO1FBQ25CLElBQUksQ0FBQyxPQUFPLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxTQUFTLENBQUMsVUFBVSxFQUFhLENBQUM7UUFDNUQsSUFBSSxDQUFDLEdBQUcsR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLFNBQVMsQ0FBQyxHQUFHLENBQUM7UUFFcEMsSUFBSSxDQUFDLHdCQUF3QixHQUFHLElBQUksb0NBQXdCLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxTQUFTLENBQUMsQ0FBQztJQUNyRixDQUFDO0lBRU8saUJBQWlCLENBQUMsVUFBa0I7UUFDMUMsT0FBTyxHQUFHLFVBQVUsYUFBYSxDQUFDO0lBQ3BDLENBQUM7SUFFRCxVQUFVLENBQUMsS0FBYTtRQUN0QixJQUFJO1lBQ0YsTUFBTSxTQUFTLEdBQUcsSUFBQSxxQkFBZSxFQUFDLElBQUksQ0FBQyxLQUFLLEVBQUUsS0FBSyxFQUFFLElBQUksQ0FBQyxDQUFDO1lBRTNELE9BQU8sSUFBSSxDQUFDLEtBQUssQ0FB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
|
|
@@ -6,5 +6,6 @@ export default class ModelToCollectionSchemaConverter {
|
|
|
6
6
|
private static convertAttribute;
|
|
7
7
|
private static convertAttributes;
|
|
8
8
|
static convert(model: ModelDefined<any, any>, logger: Logger): CollectionSchema;
|
|
9
|
+
private static convertAttributeValidation;
|
|
9
10
|
}
|
|
10
11
|
//# sourceMappingURL=model-to-collection-schema-converter.d.ts.map
|
|
@@ -72,13 +72,7 @@ class ModelToCollectionSchemaConverter {
|
|
|
72
72
|
allowNull: attribute.allowNull,
|
|
73
73
|
isSortable: true,
|
|
74
74
|
};
|
|
75
|
-
|
|
76
|
-
!column.isReadOnly &&
|
|
77
|
-
!attribute.defaultValue &&
|
|
78
|
-
// eslint-disable-next-line no-underscore-dangle
|
|
79
|
-
!attribute._autoGenerated) {
|
|
80
|
-
column.validation.push({ operator: 'Present' });
|
|
81
|
-
}
|
|
75
|
+
column.validation.push(...ModelToCollectionSchemaConverter.convertAttributeValidation(attribute, column));
|
|
82
76
|
if (attribute.primaryKey)
|
|
83
77
|
column.isPrimaryKey = true;
|
|
84
78
|
if (attribute.defaultValue !== null &&
|
|
@@ -123,6 +117,92 @@ class ModelToCollectionSchemaConverter {
|
|
|
123
117
|
segments: [],
|
|
124
118
|
};
|
|
125
119
|
}
|
|
120
|
+
static convertAttributeValidation(attribute, column) {
|
|
121
|
+
const validations = [];
|
|
122
|
+
if (attribute.allowNull === false &&
|
|
123
|
+
!column.isReadOnly &&
|
|
124
|
+
!attribute.defaultValue &&
|
|
125
|
+
// eslint-disable-next-line no-underscore-dangle
|
|
126
|
+
!attribute._autoGenerated) {
|
|
127
|
+
validations.push({ operator: 'Present' });
|
|
128
|
+
}
|
|
129
|
+
// eslint-disable-next-line
|
|
130
|
+
if (!attribute.validate || attribute._autoGenerated === true) {
|
|
131
|
+
return validations;
|
|
132
|
+
}
|
|
133
|
+
if (attribute.validate.min) {
|
|
134
|
+
validations.push({
|
|
135
|
+
operator: 'GreaterThan',
|
|
136
|
+
value: attribute.validate.min.args || attribute.validate.min,
|
|
137
|
+
});
|
|
138
|
+
}
|
|
139
|
+
if (attribute.validate.max) {
|
|
140
|
+
validations.push({
|
|
141
|
+
operator: 'LessThan',
|
|
142
|
+
value: attribute.validate.max.args || attribute.validate.max,
|
|
143
|
+
});
|
|
144
|
+
}
|
|
145
|
+
if (attribute.validate.isBefore) {
|
|
146
|
+
validations.push({
|
|
147
|
+
operator: 'Before',
|
|
148
|
+
value: attribute.validate.isBefore.args || attribute.validate.isBefore,
|
|
149
|
+
});
|
|
150
|
+
}
|
|
151
|
+
if (attribute.validate.isAfter) {
|
|
152
|
+
validations.push({
|
|
153
|
+
operator: 'After',
|
|
154
|
+
value: attribute.validate.isAfter.args || attribute.validate.isAfter,
|
|
155
|
+
});
|
|
156
|
+
}
|
|
157
|
+
if (attribute.validate.len) {
|
|
158
|
+
const length = attribute.validate.len.args || attribute.validate.len;
|
|
159
|
+
if (Array.isArray(length) && length.length) {
|
|
160
|
+
validations.push({
|
|
161
|
+
operator: 'LongerThan',
|
|
162
|
+
value: length[0],
|
|
163
|
+
});
|
|
164
|
+
if (length.length === 2) {
|
|
165
|
+
validations.push({
|
|
166
|
+
operator: 'ShorterThan',
|
|
167
|
+
value: length[1],
|
|
168
|
+
});
|
|
169
|
+
}
|
|
170
|
+
}
|
|
171
|
+
else {
|
|
172
|
+
validations.push({
|
|
173
|
+
operator: 'LongerThan',
|
|
174
|
+
value: length,
|
|
175
|
+
});
|
|
176
|
+
}
|
|
177
|
+
}
|
|
178
|
+
if (attribute.validate.equals) {
|
|
179
|
+
validations.push({
|
|
180
|
+
operator: 'Equal',
|
|
181
|
+
value: attribute.validate.equals.toString(),
|
|
182
|
+
});
|
|
183
|
+
}
|
|
184
|
+
if (attribute.validate.contains) {
|
|
185
|
+
validations.push({
|
|
186
|
+
operator: 'Contains',
|
|
187
|
+
value: attribute.validate.contains,
|
|
188
|
+
});
|
|
189
|
+
}
|
|
190
|
+
if (attribute.validate.is) {
|
|
191
|
+
const value = attribute.validate.is;
|
|
192
|
+
if (!Array.isArray(attribute.validate.is)) {
|
|
193
|
+
validations.push({
|
|
194
|
+
operator: 'Like',
|
|
195
|
+
value: value.toString(),
|
|
196
|
+
});
|
|
197
|
+
}
|
|
198
|
+
}
|
|
199
|
+
if (attribute.validate.notEmpty) {
|
|
200
|
+
validations.push({
|
|
201
|
+
operator: 'Present',
|
|
202
|
+
});
|
|
203
|
+
}
|
|
204
|
+
return validations;
|
|
205
|
+
}
|
|
126
206
|
}
|
|
127
207
|
exports.default = ModelToCollectionSchemaConverter;
|
|
128
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
208
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"model-to-collection-schema-converter.js","sourceRoot":"","sources":["../../src/utils/model-to-collection-schema-converter.ts"],"names":[],"mappings":"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"}
|