@forestadmin/datasource-sequelize 1.0.0-beta.4 → 1.0.0-beta.5
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,3 +1,10 @@
|
|
|
1
|
+
# @forestadmin/datasource-sequelize [1.0.0-beta.5](https://github.com/ForestAdmin/agent-nodejs/compare/@forestadmin/datasource-sequelize@1.0.0-beta.4...@forestadmin/datasource-sequelize@1.0.0-beta.5) (2022-04-19)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### Bug Fixes
|
|
5
|
+
|
|
6
|
+
* **datasource sequelize:** type converter compute correctly type from sequelize DataTypes ([#246](https://github.com/ForestAdmin/agent-nodejs/issues/246)) ([92fc238](https://github.com/ForestAdmin/agent-nodejs/commit/92fc23841c25c502f44fd90c5e68f864ecc6727b))
|
|
7
|
+
|
|
1
8
|
# @forestadmin/datasource-sequelize [1.0.0-beta.4](https://github.com/ForestAdmin/agent-nodejs/compare/@forestadmin/datasource-sequelize@1.0.0-beta.3...@forestadmin/datasource-sequelize@1.0.0-beta.4) (2022-04-15)
|
|
2
9
|
|
|
3
10
|
|
|
@@ -57,7 +57,7 @@ class ModelToCollectionSchemaConverter {
|
|
|
57
57
|
static convertAttribute(attribute) {
|
|
58
58
|
const sequelizeColumnType = attribute.type;
|
|
59
59
|
const columnType = type_converter_1.default.fromDataType(sequelizeColumnType);
|
|
60
|
-
const filterOperators = type_converter_1.default.
|
|
60
|
+
const filterOperators = type_converter_1.default.operatorsForColumnType(columnType);
|
|
61
61
|
const column = {
|
|
62
62
|
columnType,
|
|
63
63
|
filterOperators,
|
|
@@ -107,4 +107,4 @@ class ModelToCollectionSchemaConverter {
|
|
|
107
107
|
}
|
|
108
108
|
}
|
|
109
109
|
exports.default = ModelToCollectionSchemaConverter;
|
|
110
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
110
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibW9kZWwtdG8tY29sbGVjdGlvbi1zY2hlbWEtY29udmVydGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3V0aWxzL21vZGVsLXRvLWNvbGxlY3Rpb24tc2NoZW1hLWNvbnZlcnRlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUFBLHlDQVVtQjtBQVNuQixzRUFBNkM7QUFFN0MsTUFBcUIsZ0NBQWdDO0lBQzNDLE1BQU0sQ0FBQyxrQkFBa0I7SUFDL0IsOERBQThEO0lBQzlELFdBQTBEO1FBRTFELFFBQVEsV0FBVyxDQUFDLGVBQWUsRUFBRTtZQUNuQyxLQUFLLHFCQUFTLENBQUMsSUFBSTtnQkFDakIsT0FBTztvQkFDTCxpQkFBaUIsRUFBRSxXQUFXLENBQUMsTUFBTSxDQUFDLElBQUk7b0JBQzFDLFVBQVUsRUFBRSxXQUFXLENBQUMsVUFBVTtvQkFDbEMsZ0JBQWdCLEVBQUcsV0FBZ0QsQ0FBQyxTQUFTO29CQUM3RSxJQUFJLEVBQUUsV0FBVztpQkFDbEIsQ0FBQztZQUNKLEtBQUsseUJBQWEsQ0FBQyxJQUFJO2dCQUNyQixPQUFPO29CQUNMLGlCQUFpQixFQUFFLFdBQVcsQ0FBQyxNQUFNLENBQUMsSUFBSTtvQkFDMUMsaUJBQWlCLEVBQUcsV0FBNkIsQ0FBQyxPQUFPLENBQUMsS0FBSyxDQUFDLElBQUk7b0JBQ3BFLFNBQVMsRUFBRyxXQUE2QixDQUFDLFVBQVU7b0JBQ3BELGVBQWUsRUFBRyxXQUE2QixDQUFDLFNBQVM7b0JBQ3pELFVBQVUsRUFBRyxXQUE2QixDQUFDLFFBQVE7b0JBQ25ELGdCQUFnQixFQUFHLFdBQTZCLENBQUMsU0FBUztvQkFDMUQsSUFBSSxFQUFFLFlBQVk7aUJBQ25CLENBQUM7WUFDSixLQUFLLG1CQUFPLENBQUMsSUFBSTtnQkFDZixPQUFPO29CQUNMLGlCQUFpQixFQUFFLFdBQVcsQ0FBQyxNQUFNLENBQUMsSUFBSTtvQkFDMUMsU0FBUyxFQUFFLFdBQVcsQ0FBQyxVQUFVO29C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
|
|
@@ -1,11 +1,11 @@
|
|
|
1
|
-
import { AbstractDataTypeConstructor,
|
|
1
|
+
import { AbstractDataTypeConstructor, DataType } from 'sequelize';
|
|
2
2
|
import { ColumnType, Operator, PrimitiveTypes } from '@forestadmin/datasource-toolkit';
|
|
3
3
|
export default class TypeConverter {
|
|
4
4
|
private static readonly columnTypeToDataType;
|
|
5
5
|
static fromColumnType(columnType: PrimitiveTypes): AbstractDataTypeConstructor;
|
|
6
|
-
private static
|
|
7
|
-
static fromDataType(dataType:
|
|
6
|
+
private static getColumnTypeFromDataType;
|
|
7
|
+
static fromDataType(dataType: DataType): ColumnType;
|
|
8
8
|
private static readonly baseOperators;
|
|
9
|
-
static
|
|
9
|
+
static operatorsForColumnType(columnType: ColumnType): Set<Operator>;
|
|
10
10
|
}
|
|
11
11
|
//# sourceMappingURL=type-converter.d.ts.map
|
|
@@ -9,52 +9,80 @@ class TypeConverter {
|
|
|
9
9
|
throw new Error(`Unsupported column type: "${columnType}".`);
|
|
10
10
|
return dataType;
|
|
11
11
|
}
|
|
12
|
+
static getColumnTypeFromDataType(dataType) {
|
|
13
|
+
switch (true) {
|
|
14
|
+
case dataType instanceof sequelize_1.DataTypes.BOOLEAN:
|
|
15
|
+
return 'Boolean';
|
|
16
|
+
case dataType instanceof sequelize_1.DataTypes.DATE:
|
|
17
|
+
case dataType instanceof sequelize_1.DataTypes.NOW:
|
|
18
|
+
return 'Date';
|
|
19
|
+
case dataType instanceof sequelize_1.DataTypes.DATEONLY:
|
|
20
|
+
return 'Dateonly';
|
|
21
|
+
case dataType instanceof sequelize_1.DataTypes.ENUM:
|
|
22
|
+
return 'Enum';
|
|
23
|
+
case dataType instanceof sequelize_1.DataTypes.JSON:
|
|
24
|
+
case dataType instanceof sequelize_1.DataTypes.JSONB:
|
|
25
|
+
return 'Json';
|
|
26
|
+
case dataType instanceof sequelize_1.DataTypes.BIGINT:
|
|
27
|
+
case dataType instanceof sequelize_1.DataTypes.DECIMAL:
|
|
28
|
+
case dataType instanceof sequelize_1.DataTypes.DOUBLE:
|
|
29
|
+
case dataType instanceof sequelize_1.DataTypes.FLOAT:
|
|
30
|
+
case dataType instanceof sequelize_1.DataTypes.INTEGER:
|
|
31
|
+
case dataType instanceof sequelize_1.DataTypes.MEDIUMINT:
|
|
32
|
+
case dataType instanceof sequelize_1.DataTypes.NUMBER:
|
|
33
|
+
case dataType instanceof sequelize_1.DataTypes.REAL:
|
|
34
|
+
case dataType instanceof sequelize_1.DataTypes.SMALLINT:
|
|
35
|
+
case dataType instanceof sequelize_1.DataTypes.TINYINT:
|
|
36
|
+
return 'Number';
|
|
37
|
+
case dataType instanceof sequelize_1.DataTypes.CHAR:
|
|
38
|
+
case dataType instanceof sequelize_1.DataTypes.CITEXT:
|
|
39
|
+
case dataType instanceof sequelize_1.DataTypes.STRING:
|
|
40
|
+
case dataType instanceof sequelize_1.DataTypes.TEXT:
|
|
41
|
+
return 'String';
|
|
42
|
+
case dataType instanceof sequelize_1.DataTypes.TIME:
|
|
43
|
+
return 'Timeonly';
|
|
44
|
+
case dataType instanceof sequelize_1.DataTypes.UUID:
|
|
45
|
+
case dataType instanceof sequelize_1.DataTypes.UUIDV1:
|
|
46
|
+
case dataType instanceof sequelize_1.DataTypes.UUIDV4:
|
|
47
|
+
return 'Uuid';
|
|
48
|
+
default:
|
|
49
|
+
// TODO put logging warning
|
|
50
|
+
console.warn(`Unsupported data type: "${dataType}".`);
|
|
51
|
+
}
|
|
52
|
+
}
|
|
12
53
|
static fromDataType(dataType) {
|
|
13
|
-
|
|
14
|
-
if (dataTypeName === 'ARRAY') {
|
|
54
|
+
if (dataType instanceof sequelize_1.DataTypes.ARRAY) {
|
|
15
55
|
const arrayDataType = dataType;
|
|
16
|
-
return [
|
|
56
|
+
return [TypeConverter.fromDataType(arrayDataType.type)];
|
|
17
57
|
}
|
|
18
|
-
|
|
19
|
-
if (!columnType)
|
|
20
|
-
throw new Error(`Unsupported data type: "${dataType}".`);
|
|
21
|
-
return columnType;
|
|
58
|
+
return TypeConverter.getColumnTypeFromDataType(dataType);
|
|
22
59
|
}
|
|
23
|
-
static
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
return new Set([...this.baseOperators, 'In', 'IncludesAll', 'NotIn']);
|
|
60
|
+
static operatorsForColumnType(columnType) {
|
|
61
|
+
if (Array.isArray(columnType)) {
|
|
62
|
+
return new Set([...TypeConverter.baseOperators, 'In', 'IncludesAll', 'NotIn']);
|
|
27
63
|
}
|
|
28
|
-
switch (
|
|
29
|
-
case '
|
|
30
|
-
return new Set([...
|
|
31
|
-
case '
|
|
32
|
-
case 'UUIDV1':
|
|
33
|
-
case 'UUIDV4':
|
|
64
|
+
switch (columnType) {
|
|
65
|
+
case 'Boolean':
|
|
66
|
+
return new Set([...TypeConverter.baseOperators]);
|
|
67
|
+
case 'Uuid':
|
|
34
68
|
return new Set([
|
|
35
|
-
...
|
|
69
|
+
...TypeConverter.baseOperators,
|
|
36
70
|
'Contains',
|
|
37
71
|
'EndsWith',
|
|
38
72
|
'Like',
|
|
39
73
|
'StartsWith',
|
|
40
74
|
]);
|
|
41
|
-
case '
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
case '
|
|
50
|
-
case 'TINYINT':
|
|
51
|
-
return new Set([...this.baseOperators, 'GreaterThan', 'In', 'LessThan', 'NotIn']);
|
|
52
|
-
case 'CHAR':
|
|
53
|
-
case 'CITEXT':
|
|
54
|
-
case 'STRING':
|
|
55
|
-
case 'TEXT':
|
|
75
|
+
case 'Number':
|
|
76
|
+
return new Set([
|
|
77
|
+
...TypeConverter.baseOperators,
|
|
78
|
+
'GreaterThan',
|
|
79
|
+
'In',
|
|
80
|
+
'LessThan',
|
|
81
|
+
'NotIn',
|
|
82
|
+
]);
|
|
83
|
+
case 'String':
|
|
56
84
|
return new Set([
|
|
57
|
-
...
|
|
85
|
+
...TypeConverter.baseOperators,
|
|
58
86
|
'Contains',
|
|
59
87
|
'EndsWith',
|
|
60
88
|
'In',
|
|
@@ -65,27 +93,13 @@ class TypeConverter {
|
|
|
65
93
|
'ShorterThan',
|
|
66
94
|
'StartsWith',
|
|
67
95
|
]);
|
|
68
|
-
case '
|
|
69
|
-
case '
|
|
70
|
-
|
|
71
|
-
case '
|
|
72
|
-
return new Set([...
|
|
73
|
-
case '
|
|
74
|
-
return new Set([...
|
|
75
|
-
case 'JSON':
|
|
76
|
-
case 'JSONB':
|
|
77
|
-
return new Set([...this.baseOperators]);
|
|
78
|
-
// Unsupported types.
|
|
79
|
-
case 'BLOB':
|
|
80
|
-
case 'CIDR':
|
|
81
|
-
case 'GEOGRAPHY':
|
|
82
|
-
case 'GEOMETRY':
|
|
83
|
-
case 'HSTORE':
|
|
84
|
-
case 'INET':
|
|
85
|
-
case 'MACADDR':
|
|
86
|
-
case 'RANGE':
|
|
87
|
-
case 'TSVECTOR':
|
|
88
|
-
case 'VIRTUAL':
|
|
96
|
+
case 'Date':
|
|
97
|
+
case 'Dateonly':
|
|
98
|
+
return new Set([...TypeConverter.baseOperators, 'GreaterThan', 'LessThan']);
|
|
99
|
+
case 'Enum':
|
|
100
|
+
return new Set([...TypeConverter.baseOperators, 'In', 'NotIn']);
|
|
101
|
+
case 'Json':
|
|
102
|
+
return new Set([...TypeConverter.baseOperators]);
|
|
89
103
|
default:
|
|
90
104
|
return new Set();
|
|
91
105
|
}
|
|
@@ -105,44 +119,6 @@ TypeConverter.columnTypeToDataType = {
|
|
|
105
119
|
Timeonly: sequelize_1.DataTypes.TIME,
|
|
106
120
|
Uuid: sequelize_1.DataTypes.UUID,
|
|
107
121
|
};
|
|
108
|
-
TypeConverter.dataTypeToColumnType = {
|
|
109
|
-
BIGINT: 'Number',
|
|
110
|
-
BLOB: null,
|
|
111
|
-
BOOLEAN: 'Boolean',
|
|
112
|
-
CHAR: 'String',
|
|
113
|
-
CIDR: null,
|
|
114
|
-
CITEXT: 'String',
|
|
115
|
-
DATE: 'Date',
|
|
116
|
-
DATEONLY: 'Dateonly',
|
|
117
|
-
DECIMAL: 'Number',
|
|
118
|
-
DOUBLE: 'Number',
|
|
119
|
-
ENUM: 'Enum',
|
|
120
|
-
FLOAT: 'Number',
|
|
121
|
-
GEOGRAPHY: null,
|
|
122
|
-
GEOMETRY: null,
|
|
123
|
-
HSTORE: null,
|
|
124
|
-
INET: null,
|
|
125
|
-
INTEGER: 'Number',
|
|
126
|
-
JSON: 'Json',
|
|
127
|
-
JSONB: 'Json',
|
|
128
|
-
JSONTYPE: null,
|
|
129
|
-
MACADDR: null,
|
|
130
|
-
MEDIUMINT: 'Number',
|
|
131
|
-
NOW: 'Date',
|
|
132
|
-
NUMBER: 'Number',
|
|
133
|
-
RANGE: null,
|
|
134
|
-
REAL: 'Number',
|
|
135
|
-
SMALLINT: 'Number',
|
|
136
|
-
STRING: 'String',
|
|
137
|
-
TEXT: 'String',
|
|
138
|
-
TIME: 'Timeonly',
|
|
139
|
-
TINYINT: 'Number',
|
|
140
|
-
TSVECTOR: null,
|
|
141
|
-
UUID: 'Uuid',
|
|
142
|
-
UUIDV1: 'Uuid',
|
|
143
|
-
UUIDV4: 'Uuid',
|
|
144
|
-
VIRTUAL: null,
|
|
145
|
-
};
|
|
146
122
|
TypeConverter.baseOperators = [
|
|
147
123
|
'Blank',
|
|
148
124
|
'Equal',
|
|
@@ -150,4 +126,4 @@ TypeConverter.baseOperators = [
|
|
|
150
126
|
'NotEqual',
|
|
151
127
|
'Present',
|
|
152
128
|
];
|
|
153
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
129
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidHlwZS1jb252ZXJ0ZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdXRpbHMvdHlwZS1jb252ZXJ0ZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSx5Q0FBNEY7QUFJNUYsTUFBcUIsYUFBYTtJQWtCaEMseURBQXlEO0lBQ2xELE1BQU0sQ0FBQyxjQUFjLENBQUMsVUFBMEI7UUFDckQsTUFBTSxRQUFRLEdBQUcsYUFBYSxDQUFDLG9CQUFvQixDQUFDLFVBQVUsQ0FBQyxDQUFDO1FBRWhFLElBQUksQ0FBQyxRQUFRO1lBQUUsTUFBTSxJQUFJLEtBQUssQ0FBQyw2QkFBNkIsVUFBVSxJQUFJLENBQUMsQ0FBQztRQUU1RSxPQUFPLFFBQVEsQ0FBQztJQUNsQixDQUFDO0lBRU8sTUFBTSxDQUFDLHlCQUF5QixDQUFDLFFBQWtCO1FBQ3pELFFBQVEsSUFBSSxFQUFFO1lBQ1osS0FBSyxRQUFRLFlBQVkscUJBQVMsQ0FBQyxPQUFPO2dCQUN4QyxPQUFPLFNBQVMsQ0FBQztZQUNuQixLQUFLLFFBQVEsWUFBWSxxQkFBUyxDQUFDLElBQUksQ0FBQztZQUN4QyxLQUFLLFFBQVEsWUFBWSxxQkFBUyxDQUFDLEdBQUc7Z0JBQ3BDLE9BQU8sTUFBTSxDQUFDO1lBQ2hCLEtBQUssUUFBUSxZQUFZLHFCQUFTLENBQUMsUUFBUTtnQkFDekMsT0FBTyxVQUFVLENBQUM7WUFDcEIsS0FBSyxRQUFRLFlBQVkscUJBQVMsQ0FBQyxJQUFJO2dCQUNyQyxPQUFPLE1BQU0sQ0FBQztZQUNoQixLQUFLLFFBQVEsWUFBWSxxQkFBUyxDQUFDLElBQUksQ0FBQztZQUN4QyxLQUFLLFFBQVEsWUFBWSxxQkFBUyxDQUFDLEtBQUs7Z0JBQ3RDLE9BQU8sTUFBTSxDQUFDO1lBQ2hCLEtBQUssUUFBUSxZQUFZLHFCQUFTLENBQUMsTUFBTSxDQUFDO1lBQzFDLEtBQUssUUFBUSxZQUFZLHFCQUFTLENBQUMsT0FBTyxDQUFDO1lBQzNDLEtBQUssUUFBUSxZ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
|