namirasoft-node-sequelize 1.4.12 → 1.4.13
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.
|
@@ -20,7 +20,7 @@ export declare abstract class BaseSequelizeTable<D extends BaseSequelizeDatabase
|
|
|
20
20
|
getColumnOption(name: string): BaseSequelizeModelAttributeColumnOptions;
|
|
21
21
|
forEachColumn(handler: (name: string, column: BaseSequelizeModelAttributeColumnOptions) => void): void;
|
|
22
22
|
getColumn(name: string): BaseMetaColumn;
|
|
23
|
-
protected getTypeSchema(
|
|
23
|
+
protected getTypeSchema(name: string, option: BaseSequelizeModelAttributeColumnOptions): BaseTypeSchema;
|
|
24
24
|
protected isFloat(type: any): type is {
|
|
25
25
|
options: {
|
|
26
26
|
length: number;
|
|
@@ -84,7 +84,7 @@ class BaseSequelizeTable extends namirasoft_node_1.BaseTable {
|
|
|
84
84
|
let column = new namirasoft_core_1.BaseMetaColumn(table, name, name, type, option.allowNull != true);
|
|
85
85
|
return column;
|
|
86
86
|
}
|
|
87
|
-
getTypeSchema(
|
|
87
|
+
getTypeSchema(name, option) {
|
|
88
88
|
var _a, _b, _c, _d, _e, _f, _g, _h, _j;
|
|
89
89
|
let required = !((_a = option.allowNull) !== null && _a !== void 0 ? _a : true);
|
|
90
90
|
let type = option.type;
|
|
@@ -136,8 +136,8 @@ class BaseSequelizeTable extends namirasoft_node_1.BaseTable {
|
|
|
136
136
|
else if (type instanceof sequelize_1.DataTypes.TIME)
|
|
137
137
|
return new namirasoft_schema_1.TimeSchema(required);
|
|
138
138
|
else if (this.isEnum(type)) {
|
|
139
|
-
let
|
|
140
|
-
return new namirasoft_schema_1.EnumSchema(
|
|
139
|
+
let _name = namirasoft_core_1.NamingConvention.lower_case_underscore.convert(this.model.name + "_" + option.field, namirasoft_core_1.NamingConvention.Pascal_Case);
|
|
140
|
+
return new namirasoft_schema_1.EnumSchema(_name, required, type.options.values);
|
|
141
141
|
}
|
|
142
142
|
else if (type instanceof sequelize_1.DataTypes.JSON) {
|
|
143
143
|
let tags_type = (_j = option.tags) === null || _j === void 0 ? void 0 : _j.type;
|
|
@@ -153,7 +153,7 @@ class BaseSequelizeTable extends namirasoft_node_1.BaseTable {
|
|
|
153
153
|
}
|
|
154
154
|
return new namirasoft_schema_1.AnySchema(required);
|
|
155
155
|
}
|
|
156
|
-
throw new Error(
|
|
156
|
+
throw new Error(`Unsupported datatype for name: '${name}' schema: '${option.type}'`);
|
|
157
157
|
}
|
|
158
158
|
isFloat(type) {
|
|
159
159
|
return type instanceof sequelize_1.DataTypes.FLOAT;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BaseSequelizeTable.js","sourceRoot":"","sources":["../src/BaseSequelizeTable.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"BaseSequelizeTable.js","sourceRoot":"","sources":["../src/BaseSequelizeTable.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -99,7 +99,7 @@ export abstract class BaseSequelizeTable<D extends BaseSequelizeDatabase, M exte
|
|
|
99
99
|
let column = new BaseMetaColumn(table, name, name, type, option.allowNull != true);
|
|
100
100
|
return column;
|
|
101
101
|
}
|
|
102
|
-
protected override getTypeSchema(
|
|
102
|
+
protected override getTypeSchema(name: string, option: BaseSequelizeModelAttributeColumnOptions): BaseTypeSchema
|
|
103
103
|
{
|
|
104
104
|
let required = !(option.allowNull ?? true);
|
|
105
105
|
let type = option.type as any;
|
|
@@ -155,8 +155,8 @@ export abstract class BaseSequelizeTable<D extends BaseSequelizeDatabase, M exte
|
|
|
155
155
|
return new TimeSchema(required);
|
|
156
156
|
else if (this.isEnum(type))
|
|
157
157
|
{
|
|
158
|
-
let
|
|
159
|
-
return new EnumSchema(
|
|
158
|
+
let _name = NamingConvention.lower_case_underscore.convert(this.model.name + "_" + option.field, NamingConvention.Pascal_Case);
|
|
159
|
+
return new EnumSchema(_name, required, type.options.values);
|
|
160
160
|
}
|
|
161
161
|
else if (type instanceof DataTypes.JSON)
|
|
162
162
|
{
|
|
@@ -174,7 +174,7 @@ export abstract class BaseSequelizeTable<D extends BaseSequelizeDatabase, M exte
|
|
|
174
174
|
}
|
|
175
175
|
return new AnySchema(required);
|
|
176
176
|
}
|
|
177
|
-
throw new Error(
|
|
177
|
+
throw new Error(`Unsupported datatype for name: '${name}' schema: '${option.type}'`);
|
|
178
178
|
}
|
|
179
179
|
protected isFloat(type: any): type is { options: { length: number, decimals: number } }
|
|
180
180
|
{
|