remult 0.12.7 → 0.13.1

package/valueConverters.d.ts

@@ -1,25 +1,12 @@
-import { ClassType } from "./classType";
-import { ValueConverter, ValueListItem } from "./src/column-interfaces";
-export declare const DateValueConverter: ValueConverter<Date>;
-export declare const DateOnlyValueConverter: ValueConverter<Date>;
-export declare const CharDateValueConverter: ValueConverter<Date>;
-export declare const BoolValueConverter: ValueConverter<Boolean>;
-export declare const NumberValueConverter: ValueConverter<number>;
-export declare const IntegerValueConverter: ValueConverter<number>;
-export declare const DefaultValueConverter: ValueConverter<any>;
-export declare class ValueListValueConverter<T extends ValueListItem> implements ValueConverter<T> {
-    private type;
-    private info;
-    constructor(type: ClassType<T>);
-    fromJson(val: any): T;
-    toJson(val: T): any;
-    fromDb(val: any): T;
-    toDb(val: T): any;
-    toInput(val: T, inputType: string): string;
-    fromInput(val: string, inputType: string): T;
-    displayValue?(val: T): string;
-    fieldTypeInDb?: string;
-    inputType?: string;
-    getOptions(): T[];
-    byId(key: any): T;
+import { ValueConverter } from "./src/column-interfaces";
+export declare class ValueConverters {
+    static readonly Date: ValueConverter<Date>;
+    static readonly DateOnly: ValueConverter<Date>;
+    static readonly DateOnlyString: ValueConverter<Date>;
+    static readonly Boolean: ValueConverter<Boolean>;
+    static readonly Number: ValueConverter<number>;
+    static readonly Integer: ValueConverter<number>;
+    static readonly Default: ValueConverter<any>;
+    static readonly JsonString: ValueConverter<any>;
+    static readonly JsonValue: ValueConverter<any>;
 }

package/valueConverters.js

@@ -1,226 +1,164 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ValueListValueConverter = exports.DefaultValueConverter = exports.IntegerValueConverter = exports.NumberValueConverter = exports.BoolValueConverter = exports.CharDateValueConverter = exports.DateOnlyValueConverter = exports.DateValueConverter = void 0;
+exports.ValueConverters = void 0;
 var tslib_1 = require("tslib");
 var inputTypes_1 = require("./inputTypes");
-var column_1 = require("./src/column");
-exports.DateValueConverter = {
-    toJson: function (val) {
-        if (!val)
-            return '';
-        if (typeof (val) === "string")
-            val = new Date(val);
-        if (val instanceof Date) {
-            return val.toISOString();
-        }
-        else {
-            console.log("ToJsonError", val);
-            throw new Error("Expected date but got val");
-        }
-    },
-    fromJson: function (val) {
-        if (val == undefined)
-            return undefined;
-        if (val == '')
-            return undefined;
-        if (val.startsWith('0000-00-00'))
-            return undefined;
-        return new Date(Date.parse(val));
-    },
-    toDb: function (x) { return x; },
-    fromDb: function (x) { return x; },
-    fromInput: function (x) { return exports.DateValueConverter.fromJson(x); },
-    toInput: function (x) { return exports.DateValueConverter.toJson(x); },
-    displayValue: function (val) {
-        if (!val)
-            return '';
-        return val.toLocaleString();
-    }
-};
-exports.DateOnlyValueConverter = {
-    fromInput: function (x) { return exports.DateOnlyValueConverter.fromJson(x); },
-    toInput: function (x) { return exports.DateOnlyValueConverter.toJson(x); },
-    toJson: function (val) {
-        var d = val;
-        if (typeof d === "string" || typeof (d) === "number")
-            d = new Date(d);
-        if (!d || d == null)
-            return null;
-        if (d.getHours() == 0)
-            return new Date(d.valueOf() - d.getTimezoneOffset() * 60000).toISOString().substring(0, 10);
-        else
-            return d.toISOString().substring(0, 10);
-    },
-    fromJson: function (value) {
-        if (!value || value == '' || value == '0000-00-00')
-            return null;
-        var d = new Date(Date.parse(value));
-        d.setMinutes(d.getMinutes() + d.getTimezoneOffset());
-        return d;
-    },
-    inputType: inputTypes_1.InputTypes.date,
-    toDb: function (val) {
-        if (!val)
-            return null;
-        return exports.DateOnlyValueConverter.fromJson(exports.DateOnlyValueConverter.toJson(val));
-    } //when using date storage,  the database expects and returns a date local and every where else we reflect on date iso
-    ,
-    fromDb: function (val) {
-        var d = val;
-        if (!d)
-            return null;
-        return val;
-    },
-    fieldTypeInDb: 'date',
-    displayValue: function (value) {
-        if (!value)
-            return '';
-        return value.toLocaleDateString(undefined);
+var ValueConverters = /** @class */ (function () {
+    function ValueConverters() {
     }
-};
-exports.CharDateValueConverter = tslib_1.__assign(tslib_1.__assign({}, exports.DateOnlyValueConverter), { toDb: function (d) {
-        var val = exports.DateOnlyValueConverter.toJson(d);
-        if (!val)
-            return undefined;
-        return val.replace(/-/g, '');
-    }, fromDb: function (val) {
-        if (!val)
-            return undefined;
-        return new Date(val.substring(0, 4) + '-' + val.substring(4, 6) + '-' + val.substring(6, 8));
-    } });
-exports.BoolValueConverter = {
-    toDb: function (val) { return val; },
-    inputType: inputTypes_1.InputTypes.checkbox,
-    fromDb: function (value) {
-        return exports.BoolValueConverter.fromJson(value);
-    },
-    fromJson: function (value) {
-        if (typeof value === "boolean")
-            return value;
-        if (value !== undefined && value !== null) {
-            return value.toString().trim().toLowerCase() == 'true';
+    ValueConverters.Date = {
+        toJson: function (val) {
+            if (!val)
+                return '';
+            if (typeof (val) === "string")
+                val = new Date(val);
+            if (val instanceof Date) {
+                return val.toISOString();
+            }
+            else {
+                console.log("ToJsonError", val);
+                throw new Error("Expected date but got val");
+            }
+        },
+        fromJson: function (val) {
+            if (val == undefined)
+                return undefined;
+            if (val == '')
+                return undefined;
+            if (val.startsWith('0000-00-00'))
+                return undefined;
+            return new Date(Date.parse(val));
+        },
+        toDb: function (x) { return x; },
+        fromDb: function (x) { return x; },
+        fromInput: function (x) { return ValueConverters.Date.fromJson(x); },
+        toInput: function (x) { return ValueConverters.Date.toJson(x); },
+        displayValue: function (val) {
+            if (!val)
+                return '';
+            return val.toLocaleString();
         }
-        return value;
-    },
-    toJson: function (x) { return x; },
-    fromInput: function (x) { return exports.BoolValueConverter.fromJson(x); },
-    toInput: function (x) { return exports.BoolValueConverter.toJson(x); }
-};
-exports.NumberValueConverter = {
-    fromDb: function (value) {
-        if (value !== undefined)
-            return +value;
-        return undefined;
-    },
-    toDb: function (value) { return value; },
-    fromJson: function (value) { return exports.NumberValueConverter.fromDb(value); },
-    toJson: function (value) { return exports.NumberValueConverter.toDb(value); },
-    fromInput: function (x, type) {
-        var r = +x;
-        if (!x)
-            return undefined;
-        return r;
-    },
-    toInput: function (x, type) {
-        return x === null || x === void 0 ? void 0 : x.toString();
-    },
-    inputType: inputTypes_1.InputTypes.number
-};
-exports.IntegerValueConverter = tslib_1.__assign(tslib_1.__assign({}, exports.NumberValueConverter), { toJson: function (value) {
-        var val = exports.NumberValueConverter.toDb(value);
-        if (!val)
+    };
+    ValueConverters.DateOnly = {
+        fromInput: function (x) { return ValueConverters.DateOnly.fromJson(x); },
+        toInput: function (x) { return ValueConverters.DateOnly.toJson(x); },
+        toJson: function (val) {
+            var d = val;
+            if (typeof d === "string" || typeof (d) === "number")
+                d = new Date(d);
+            if (!d || d == null)
+                return null;
+            if (d.getHours() == 0)
+                return new Date(d.valueOf() - d.getTimezoneOffset() * 60000).toISOString().substring(0, 10);
+            else
+                return d.toISOString().substring(0, 10);
+        },
+        fromJson: function (value) {
+            if (!value || value == '' || value == '0000-00-00')
+                return null;
+            var d = new Date(Date.parse(value));
+            d.setMinutes(d.getMinutes() + d.getTimezoneOffset());
+            return d;
+        },
+        inputType: inputTypes_1.InputTypes.date,
+        toDb: function (val) {
+            if (!val)
+                return null;
+            return ValueConverters.DateOnly.fromJson(ValueConverters.DateOnly.toJson(val));
+        } //when using date storage,  the database expects and returns a date local and every where else we reflect on date iso
+        ,
+        fromDb: function (val) {
+            var d = val;
+            if (!d)
+                return null;
             return val;
-        return +(+val).toFixed(0);
-    }, toDb: function (value) { return exports.IntegerValueConverter.toJson(value); }, fieldTypeInDb: 'integer' });
-exports.DefaultValueConverter = {
-    fromJson: function (x) { return x; },
-    toJson: function (x) { return x; },
-    fromDb: function (x) { return x == null ? null : x ? JSON.parse(exports.DefaultValueConverter.fromJson(x)) : undefined; },
-    toDb: function (x) { return x !== undefined ? x === null ? null : JSON.stringify(exports.DefaultValueConverter.toJson(x)) : undefined; },
-    fromInput: function (x) { return exports.DefaultValueConverter.fromJson(x); },
-    toInput: function (x) { return exports.DefaultValueConverter.toJson(x); }
-};
-var ValueListValueConverter = /** @class */ (function () {
-    function ValueListValueConverter(type) {
-        this.type = type;
-        this.info = ValueListInfo.get(this.type);
-        if (this.info.isNumeric) {
-            this.fieldTypeInDb = 'integer';
+        },
+        fieldTypeInDb: 'date',
+        displayValue: function (value) {
+            if (!value)
+                return '';
+            return value.toLocaleDateString(undefined);
         }
-    }
-    ValueListValueConverter.prototype.fromJson = function (val) {
-        return this.byId(val);
     };
-    ValueListValueConverter.prototype.toJson = function (val) {
-        if (!val)
-            return undefined;
-        return val.id;
-    };
-    ValueListValueConverter.prototype.fromDb = function (val) {
-        return this.fromJson(val);
-    };
-    ValueListValueConverter.prototype.toDb = function (val) {
-        return this.toJson(val);
-    };
-    ValueListValueConverter.prototype.toInput = function (val, inputType) {
-        return this.toJson(val);
-    };
-    ValueListValueConverter.prototype.fromInput = function (val, inputType) {
-        return this.fromJson(val);
-    };
-    ValueListValueConverter.prototype.displayValue = function (val) {
-        if (!val)
-            return '';
-        return val.caption;
-    };
-    ValueListValueConverter.prototype.getOptions = function () {
-        return this.info.getOptions();
+    ValueConverters.DateOnlyString = tslib_1.__assign(tslib_1.__assign({}, ValueConverters.DateOnly), { toDb: function (d) {
+            var val = ValueConverters.DateOnly.toJson(d);
+            if (!val)
+                return undefined;
+            return val.replace(/-/g, '');
+        }, fromDb: function (val) {
+            if (!val)
+                return undefined;
+            return new Date(val.substring(0, 4) + '-' + val.substring(4, 6) + '-' + val.substring(6, 8));
+        } });
+    ValueConverters.Boolean = {
+        toDb: function (val) { return val; },
+        inputType: inputTypes_1.InputTypes.checkbox,
+        fromDb: function (value) {
+            return ValueConverters.Boolean.fromJson(value);
+        },
+        fromJson: function (value) {
+            if (typeof value === "boolean")
+                return value;
+            if (value !== undefined && value !== null) {
+                return value.toString().trim().toLowerCase() == 'true';
+            }
+            return value;
+        },
+        toJson: function (x) { return x; },
+        fromInput: function (x) { return ValueConverters.Boolean.fromJson(x); },
+        toInput: function (x) { return ValueConverters.Boolean.toJson(x); }
     };
-    ValueListValueConverter.prototype.byId = function (key) {
-        if (key === undefined)
+    ValueConverters.Number = {
+        fromDb: function (value) {
+            if (value !== undefined)
+                return +value;
             return undefined;
-        if (this.info.isNumeric)
-            key = +key;
-        return this.info.byId(key);
+        },
+        toDb: function (value) { return value; },
+        fromJson: function (value) { return ValueConverters.Number.fromDb(value); },
+        toJson: function (value) { return ValueConverters.Number.toDb(value); },
+        fromInput: function (x, type) {
+            var r = +x;
+            if (!x)
+                return undefined;
+            return r;
+        },
+        toInput: function (x, type) {
+            return x === null || x === void 0 ? void 0 : x.toString();
+        },
+        inputType: inputTypes_1.InputTypes.number
     };
-    return ValueListValueConverter;
-}());
-exports.ValueListValueConverter = ValueListValueConverter;
-var ValueListInfo = /** @class */ (function () {
-    function ValueListInfo(valueListType) {
-        this.valueListType = valueListType;
-        this.byIdMap = new Map();
-        this.values = [];
-        this.isNumeric = false;
-        for (var member in this.valueListType) {
-            var s = this.valueListType[member];
-            if (s instanceof this.valueListType) {
-                if (s.id === undefined)
-                    s.id = member;
-                if (s.caption === undefined)
-                    s.caption = column_1.makeTitle(member);
-                if (typeof s.id === 'number')
-                    this.isNumeric = true;
-                this.byIdMap.set(s.id, s);
-                this.values.push(s);
-            }
-        }
-    }
-    ValueListInfo.get = function (type) {
-        var r = typeCache.get(type);
-        if (!r)
-            r = new ValueListInfo(type);
-        typeCache.set(type, r);
-        return r;
+    ValueConverters.Integer = tslib_1.__assign(tslib_1.__assign({}, ValueConverters.Number), { toJson: function (value) {
+            var val = ValueConverters.Number.toDb(value);
+            if (!val)
+                return val;
+            return +(+val).toFixed(0);
+        }, toDb: function (value) { return ValueConverters.Integer.toJson(value); }, fieldTypeInDb: 'integer' });
+    ValueConverters.Default = {
+        fromJson: function (x) { return x; },
+        toJson: function (x) { return x; },
+        fromDb: function (x) { return ValueConverters.JsonString.fromDb(x); },
+        toDb: function (x) { return ValueConverters.JsonString.toDb(x); },
+        fromInput: function (x) { return ValueConverters.Default.fromJson(x); },
+        toInput: function (x) { return ValueConverters.Default.toJson(x); }
     };
-    ValueListInfo.prototype.getOptions = function () {
-        return this.values;
+    ValueConverters.JsonString = {
+        fromJson: function (x) { return x; },
+        toJson: function (x) { return x; },
+        fromDb: function (x) { return x == null ? null : x ? JSON.parse(ValueConverters.JsonString.fromJson(x)) : undefined; },
+        toDb: function (x) { return x !== undefined ? x === null ? null : JSON.stringify(ValueConverters.JsonString.toJson(x)) : undefined; },
+        fromInput: function (x) { return ValueConverters.JsonString.fromJson(x); },
+        toInput: function (x) { return ValueConverters.JsonString.toJson(x); }
     };
-    ValueListInfo.prototype.byId = function (key) {
-        if (this.isNumeric)
-            key = +key;
-        return this.byIdMap.get(key);
+    ValueConverters.JsonValue = {
+        fromJson: function (x) { return x; },
+        toJson: function (x) { return x; },
+        fromDb: function (x) { return x; },
+        toDb: function (x) { return x; },
+        fromInput: function (x) { return ValueConverters.JsonString.fromJson(x); },
+        toInput: function (x) { return ValueConverters.JsonString.toJson(x); },
+        fieldTypeInDb: 'json'
     };
-    return ValueListInfo;
+    return ValueConverters;
 }());
-var typeCache = new Map();
+exports.ValueConverters = ValueConverters;