remult 0.16.3-exp.4 → 0.16.3
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/esm/postgres/postgresColumnSyntax.d.ts +2 -0
- package/esm/postgres/postgresColumnSyntax.js +30 -0
- package/esm/remult-middleware.d.ts +2 -0
- package/esm/remult-middleware.js +65 -0
- package/esm/server/expressBridge.d.ts +2 -0
- package/esm/server/expressBridge.js +14 -8
- package/esm/server/initAsyncHooks.js +0 -1
- package/esm/server/register-actions-on-server.d.ts +3 -0
- package/esm/server/register-actions-on-server.js +24 -0
- package/esm/server/register-entities-on-server.d.ts +3 -0
- package/esm/server/register-entities-on-server.js +15 -0
- package/esm/src/backend-tests/my-test.backend-spec.js +48 -0
- package/esm/src/remult-proxy.js +4 -0
- package/esm/valueConverters.d.ts +12 -0
- package/esm/valueConverters.js +169 -0
- package/package.json +1 -1
- package/postgres/postgresColumnSyntax.d.ts +2 -0
- package/postgres/postgresColumnSyntax.js +34 -0
- package/remult-middleware.d.ts +2 -0
- package/remult-middleware.js +70 -0
- package/server/expressBridge.d.ts +2 -0
- package/server/expressBridge.js +14 -8
- package/server/initAsyncHooks.js +0 -1
- package/server/register-actions-on-server.d.ts +3 -0
- package/server/register-actions-on-server.js +50 -0
- package/server/register-entities-on-server.d.ts +3 -0
- package/server/register-entities-on-server.js +19 -0
- package/src/backend-tests/my-test.backend-spec.js +57 -0
- package/src/remult-proxy.js +4 -0
- package/valueConverters.d.ts +12 -0
- package/valueConverters.js +168 -0
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
import { ValueConverters } from '../valueConverters';
|
|
2
|
+
export function postgresColumnSyntax(x, dbName) {
|
|
3
|
+
let result = dbName;
|
|
4
|
+
if (x.valueType == Number) {
|
|
5
|
+
if (!x.valueConverter.fieldTypeInDb)
|
|
6
|
+
result += " numeric" + (x.allowNull ? "" : " default 0 not null");
|
|
7
|
+
else
|
|
8
|
+
result += " " + x.valueConverter.fieldTypeInDb + (x.allowNull ? "" : " default 0 not null");
|
|
9
|
+
}
|
|
10
|
+
else if (x.valueType == Date) {
|
|
11
|
+
if (!x.valueConverter.fieldTypeInDb)
|
|
12
|
+
if (x.valueConverter == ValueConverters.DateOnly)
|
|
13
|
+
result += " date";
|
|
14
|
+
else
|
|
15
|
+
result += " timestamp";
|
|
16
|
+
else
|
|
17
|
+
result += " " + x.valueConverter.fieldTypeInDb;
|
|
18
|
+
}
|
|
19
|
+
else if (x.valueType == Boolean)
|
|
20
|
+
result += " boolean" + (x.allowNull ? "" : " default false not null");
|
|
21
|
+
else if (x.valueConverter.fieldTypeInDb) {
|
|
22
|
+
result += " " + x.valueConverter.fieldTypeInDb;
|
|
23
|
+
if (!x.allowNull && x.valueConverter.fieldTypeInDb == 'integer') {
|
|
24
|
+
result += " default 0 not null";
|
|
25
|
+
}
|
|
26
|
+
}
|
|
27
|
+
else
|
|
28
|
+
result += " varchar" + (x.allowNull ? "" : " default '' not null");
|
|
29
|
+
return result;
|
|
30
|
+
}
|
|
@@ -0,0 +1,65 @@
|
|
|
1
|
+
import { remultMiddlewareBase } from './server/expressBridge';
|
|
2
|
+
export function remultMiddleware(options) {
|
|
3
|
+
const m = new middleware();
|
|
4
|
+
let app = Object.assign((req, res, next) => m.handleRequest(req, res, next), {
|
|
5
|
+
route: (path) => m.route(path)
|
|
6
|
+
});
|
|
7
|
+
return remultMiddlewareBase(app, options);
|
|
8
|
+
}
|
|
9
|
+
class middleware {
|
|
10
|
+
constructor() {
|
|
11
|
+
this.map = new Map();
|
|
12
|
+
}
|
|
13
|
+
route(path) {
|
|
14
|
+
//consider using:
|
|
15
|
+
//* https://raw.githubusercontent.com/cmorten/opine/main/src/utils/pathToRegex.ts
|
|
16
|
+
//* https://github.com/pillarjs/path-to-regexp
|
|
17
|
+
let r = path.toLowerCase();
|
|
18
|
+
let m = new Map();
|
|
19
|
+
this.map.set(r, m);
|
|
20
|
+
const route = {
|
|
21
|
+
get: (h) => {
|
|
22
|
+
m.set("get", h);
|
|
23
|
+
return route;
|
|
24
|
+
},
|
|
25
|
+
put: (h) => {
|
|
26
|
+
m.set("put", h);
|
|
27
|
+
return route;
|
|
28
|
+
},
|
|
29
|
+
post: (h) => {
|
|
30
|
+
m.set("post", h);
|
|
31
|
+
return route;
|
|
32
|
+
},
|
|
33
|
+
delete: (h) => {
|
|
34
|
+
m.set("delete", h);
|
|
35
|
+
return route;
|
|
36
|
+
}
|
|
37
|
+
};
|
|
38
|
+
return route;
|
|
39
|
+
}
|
|
40
|
+
handleRequest(req, res, next) {
|
|
41
|
+
let lowerPath = req.path.toLowerCase();
|
|
42
|
+
let m = this.map.get(lowerPath);
|
|
43
|
+
if (m) {
|
|
44
|
+
let h = m.get(req.method.toLowerCase());
|
|
45
|
+
if (h) {
|
|
46
|
+
h(req, res, next);
|
|
47
|
+
return;
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
let idPosition = req.path.lastIndexOf('/');
|
|
51
|
+
if (idPosition >= 0) {
|
|
52
|
+
lowerPath = req.path.substring(0, idPosition) + '/:id';
|
|
53
|
+
m = this.map.get(lowerPath);
|
|
54
|
+
if (m) {
|
|
55
|
+
let h = m.get(req.method.toLowerCase());
|
|
56
|
+
if (h) {
|
|
57
|
+
req.params.id = req.path.substring(idPosition + 1);
|
|
58
|
+
h(req, res, next);
|
|
59
|
+
return;
|
|
60
|
+
}
|
|
61
|
+
}
|
|
62
|
+
}
|
|
63
|
+
next();
|
|
64
|
+
}
|
|
65
|
+
}
|
|
@@ -59,6 +59,8 @@ export interface GenericResponse {
|
|
|
59
59
|
}
|
|
60
60
|
export declare class RemultAsyncLocalStorage {
|
|
61
61
|
private readonly remultObjectStorage;
|
|
62
|
+
static enable(): void;
|
|
63
|
+
static disable(): void;
|
|
62
64
|
constructor(remultObjectStorage: import('async_hooks').AsyncLocalStorage<Remult>);
|
|
63
65
|
run(remult: Remult, callback: VoidFunction): void;
|
|
64
66
|
getRemult(): Remult;
|
|
@@ -30,6 +30,7 @@ export function createRemultServer(options) {
|
|
|
30
30
|
return dp;
|
|
31
31
|
return new (await import('./JsonEntityFileStorage')).JsonFileDataProvider('./db');
|
|
32
32
|
});
|
|
33
|
+
RemultAsyncLocalStorage.enable();
|
|
33
34
|
if (options.initApi) {
|
|
34
35
|
dataProvider = dataProvider.then(async (dp) => {
|
|
35
36
|
var remult = new Remult(dp);
|
|
@@ -63,6 +64,18 @@ export class RemultAsyncLocalStorage {
|
|
|
63
64
|
constructor(remultObjectStorage) {
|
|
64
65
|
this.remultObjectStorage = remultObjectStorage;
|
|
65
66
|
}
|
|
67
|
+
static enable() {
|
|
68
|
+
remult.remultFactory = () => {
|
|
69
|
+
const r = RemultAsyncLocalStorage.instance.getRemult();
|
|
70
|
+
if (r)
|
|
71
|
+
return r;
|
|
72
|
+
else
|
|
73
|
+
throw new Error("remult object was requested outside of a valid context, try running it within initApi or a remult request cycle");
|
|
74
|
+
};
|
|
75
|
+
}
|
|
76
|
+
static disable() {
|
|
77
|
+
remult.resetFactory();
|
|
78
|
+
}
|
|
66
79
|
run(remult, callback) {
|
|
67
80
|
if (this.remultObjectStorage)
|
|
68
81
|
this.remultObjectStorage.run(remult, callback);
|
|
@@ -71,19 +84,12 @@ export class RemultAsyncLocalStorage {
|
|
|
71
84
|
}
|
|
72
85
|
getRemult() {
|
|
73
86
|
if (!this.remultObjectStorage) {
|
|
74
|
-
throw new Error("can't use static remult in this environment, `async_hooks` were not
|
|
87
|
+
throw new Error("can't use static remult in this environment, `async_hooks` were not initialized");
|
|
75
88
|
}
|
|
76
89
|
return this.remultObjectStorage.getStore();
|
|
77
90
|
}
|
|
78
91
|
}
|
|
79
92
|
RemultAsyncLocalStorage.instance = new RemultAsyncLocalStorage(undefined);
|
|
80
|
-
remult.remultFactory = () => {
|
|
81
|
-
const r = RemultAsyncLocalStorage.instance.getRemult();
|
|
82
|
-
if (r)
|
|
83
|
-
return r;
|
|
84
|
-
else
|
|
85
|
-
throw new Error("remult object was requested outside of a valid context, try running it within initApi or a remult request cycle");
|
|
86
|
-
};
|
|
87
93
|
class RemultServerImplementation {
|
|
88
94
|
constructor(queue, options, dataProvider) {
|
|
89
95
|
this.queue = queue;
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
import { serverActionField, actionInfo, classBackendMethodsArray } from '../src/server-action';
|
|
2
|
+
export function registerActionsOnServer(area, controllers) {
|
|
3
|
+
var addAction = (a) => {
|
|
4
|
+
let x = a[serverActionField];
|
|
5
|
+
if (!x) {
|
|
6
|
+
throw 'failed to set server action, did you forget the BackendMethod Decorator?';
|
|
7
|
+
}
|
|
8
|
+
area.addAction(x);
|
|
9
|
+
};
|
|
10
|
+
actionInfo.runningOnServer = true;
|
|
11
|
+
if (controllers && controllers.length > 0) {
|
|
12
|
+
for (const c of controllers) {
|
|
13
|
+
let z = c[classBackendMethodsArray];
|
|
14
|
+
if (z)
|
|
15
|
+
for (const a of z) {
|
|
16
|
+
addAction(a);
|
|
17
|
+
}
|
|
18
|
+
}
|
|
19
|
+
}
|
|
20
|
+
else
|
|
21
|
+
actionInfo.allActions.forEach((a) => {
|
|
22
|
+
addAction(a);
|
|
23
|
+
});
|
|
24
|
+
}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
import { getEntityKey } from "../src/remult3";
|
|
2
|
+
import { allEntities } from "../src/context";
|
|
3
|
+
import { DataApi } from "../src/data-api";
|
|
4
|
+
export function registerEntitiesOnServer(area, entities) {
|
|
5
|
+
if (!entities)
|
|
6
|
+
entities = allEntities;
|
|
7
|
+
//add Api Entries
|
|
8
|
+
entities.forEach(e => {
|
|
9
|
+
let key = getEntityKey(e);
|
|
10
|
+
if (key != undefined)
|
|
11
|
+
area.add(key, c => {
|
|
12
|
+
return new DataApi(c.repo(e), c);
|
|
13
|
+
});
|
|
14
|
+
});
|
|
15
|
+
}
|
|
@@ -1,8 +1,12 @@
|
|
|
1
|
+
import { Remult } from "../context";
|
|
1
2
|
import { KnexDataProvider } from '../../remult-knex';
|
|
2
3
|
import { config } from 'dotenv';
|
|
3
4
|
import { testKnexPGSqlImpl, testPostgresImplementation } from "./backend-database-test-setup.backend-spec";
|
|
4
5
|
import { entityWithValidations } from "../shared-tests/entityWithValidations";
|
|
5
6
|
import { SqlDatabase } from "../data-providers/sql-database";
|
|
7
|
+
import { RemultAsyncLocalStorage } from "../../server/expressBridge";
|
|
8
|
+
import { initAsyncHooks } from "../../server/initAsyncHooks";
|
|
9
|
+
import { remult } from "../remult-proxy";
|
|
6
10
|
config();
|
|
7
11
|
testPostgresImplementation("default order by", async ({ createEntity }) => {
|
|
8
12
|
let s = await entityWithValidations.create4RowsInDp(createEntity);
|
|
@@ -57,3 +61,47 @@ testKnexPGSqlImpl("knex filter2", async ({ createEntity }) => {
|
|
|
57
61
|
}
|
|
58
62
|
})).length).toBe(3);
|
|
59
63
|
}, false);
|
|
64
|
+
it("test async hooks and static remult", async () => {
|
|
65
|
+
let gotException = true;
|
|
66
|
+
try {
|
|
67
|
+
RemultAsyncLocalStorage.instance.getRemult();
|
|
68
|
+
gotException = false;
|
|
69
|
+
}
|
|
70
|
+
catch { }
|
|
71
|
+
expect(gotException).toBe(true);
|
|
72
|
+
initAsyncHooks();
|
|
73
|
+
expect(RemultAsyncLocalStorage.instance.getRemult()).toBe(undefined);
|
|
74
|
+
RemultAsyncLocalStorage.enable();
|
|
75
|
+
try {
|
|
76
|
+
remult.isAllowed(false);
|
|
77
|
+
gotException = false;
|
|
78
|
+
}
|
|
79
|
+
catch { }
|
|
80
|
+
expect(gotException).toBe(true);
|
|
81
|
+
const promises = [];
|
|
82
|
+
RemultAsyncLocalStorage.instance.run(new Remult(), () => {
|
|
83
|
+
remult.user = { id: 'noam' };
|
|
84
|
+
promises.push(new Promise(res => {
|
|
85
|
+
setTimeout(() => {
|
|
86
|
+
expect(remult.user.id).toBe('noam');
|
|
87
|
+
res({});
|
|
88
|
+
}, 10);
|
|
89
|
+
}));
|
|
90
|
+
RemultAsyncLocalStorage.instance.run(new Remult(), () => {
|
|
91
|
+
remult.user = { id: 'yoni' };
|
|
92
|
+
promises.push(new Promise(res => {
|
|
93
|
+
setTimeout(() => {
|
|
94
|
+
expect(remult.user.id).toBe('yoni');
|
|
95
|
+
res({});
|
|
96
|
+
}, 10);
|
|
97
|
+
}));
|
|
98
|
+
});
|
|
99
|
+
promises.push(new Promise(res => {
|
|
100
|
+
setTimeout(() => {
|
|
101
|
+
expect(remult.user.id).toBe('noam');
|
|
102
|
+
res({});
|
|
103
|
+
}, 10);
|
|
104
|
+
}));
|
|
105
|
+
});
|
|
106
|
+
await Promise.all(promises);
|
|
107
|
+
});
|
package/esm/src/remult-proxy.js
CHANGED
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
import { ValueConverter } from "./src/column-interfaces";
|
|
2
|
+
export declare class ValueConverters {
|
|
3
|
+
static readonly Date: ValueConverter<Date>;
|
|
4
|
+
static readonly DateOnly: ValueConverter<Date>;
|
|
5
|
+
static readonly DateOnlyString: ValueConverter<Date>;
|
|
6
|
+
static readonly Boolean: ValueConverter<Boolean>;
|
|
7
|
+
static readonly Number: ValueConverter<number>;
|
|
8
|
+
static readonly Integer: ValueConverter<number>;
|
|
9
|
+
static readonly Default: ValueConverter<any>;
|
|
10
|
+
static readonly JsonString: ValueConverter<any>;
|
|
11
|
+
static readonly JsonValue: ValueConverter<any>;
|
|
12
|
+
}
|
|
@@ -0,0 +1,169 @@
|
|
|
1
|
+
import { InputTypes } from "./inputTypes";
|
|
2
|
+
export class ValueConverters {
|
|
3
|
+
}
|
|
4
|
+
ValueConverters.Date = {
|
|
5
|
+
toJson: (val) => {
|
|
6
|
+
if (!val)
|
|
7
|
+
return '';
|
|
8
|
+
if (typeof (val) === "string")
|
|
9
|
+
val = new Date(val);
|
|
10
|
+
if (val instanceof Date) {
|
|
11
|
+
return val.toISOString();
|
|
12
|
+
}
|
|
13
|
+
else {
|
|
14
|
+
console.log("ToJsonError", val);
|
|
15
|
+
throw new Error("Expected date but got val");
|
|
16
|
+
}
|
|
17
|
+
},
|
|
18
|
+
fromJson: (val) => {
|
|
19
|
+
if (val == undefined)
|
|
20
|
+
return undefined;
|
|
21
|
+
if (val == '')
|
|
22
|
+
return undefined;
|
|
23
|
+
if (val.startsWith('0000-00-00'))
|
|
24
|
+
return undefined;
|
|
25
|
+
return new Date(Date.parse(val));
|
|
26
|
+
},
|
|
27
|
+
toDb: x => x,
|
|
28
|
+
fromDb: x => x,
|
|
29
|
+
fromInput: x => ValueConverters.Date.fromJson(x),
|
|
30
|
+
toInput: x => ValueConverters.Date.toJson(x),
|
|
31
|
+
displayValue: (val) => {
|
|
32
|
+
if (!val)
|
|
33
|
+
return '';
|
|
34
|
+
return val.toLocaleString();
|
|
35
|
+
}
|
|
36
|
+
};
|
|
37
|
+
ValueConverters.DateOnly = {
|
|
38
|
+
fromInput: x => ValueConverters.DateOnly.fromJson(x),
|
|
39
|
+
toInput: x => ValueConverters.DateOnly.toJson(x),
|
|
40
|
+
toJson: (val) => {
|
|
41
|
+
var d = val;
|
|
42
|
+
if (typeof d === "string" || typeof (d) === "number")
|
|
43
|
+
d = new Date(d);
|
|
44
|
+
if (!d || d == null)
|
|
45
|
+
return null;
|
|
46
|
+
if (d.getHours() == 0)
|
|
47
|
+
return new Date(d.valueOf() - d.getTimezoneOffset() * 60000).toISOString().substring(0, 10);
|
|
48
|
+
else
|
|
49
|
+
return d.toISOString().substring(0, 10);
|
|
50
|
+
},
|
|
51
|
+
fromJson: (value) => {
|
|
52
|
+
if (!value || value == '' || value == '0000-00-00')
|
|
53
|
+
return null;
|
|
54
|
+
let d = new Date(Date.parse(value));
|
|
55
|
+
d.setMinutes(d.getMinutes() + d.getTimezoneOffset());
|
|
56
|
+
return d;
|
|
57
|
+
},
|
|
58
|
+
inputType: InputTypes.date,
|
|
59
|
+
toDb: (val) => {
|
|
60
|
+
if (!val)
|
|
61
|
+
return null;
|
|
62
|
+
return ValueConverters.DateOnly.fromJson(ValueConverters.DateOnly.toJson(val));
|
|
63
|
+
} //when using date storage, the database expects and returns a date local and every where else we reflect on date iso
|
|
64
|
+
,
|
|
65
|
+
fromDb: (val) => {
|
|
66
|
+
var d = val;
|
|
67
|
+
if (!d)
|
|
68
|
+
return null;
|
|
69
|
+
return val;
|
|
70
|
+
},
|
|
71
|
+
fieldTypeInDb: 'date',
|
|
72
|
+
displayValue: (value) => {
|
|
73
|
+
if (!value)
|
|
74
|
+
return '';
|
|
75
|
+
return value.toLocaleDateString(undefined);
|
|
76
|
+
}
|
|
77
|
+
};
|
|
78
|
+
ValueConverters.DateOnlyString = {
|
|
79
|
+
...ValueConverters.DateOnly,
|
|
80
|
+
toDb: (d) => {
|
|
81
|
+
let val = ValueConverters.DateOnly.toJson(d);
|
|
82
|
+
if (!val)
|
|
83
|
+
return undefined;
|
|
84
|
+
return val.replace(/-/g, '');
|
|
85
|
+
},
|
|
86
|
+
fromDb: (val) => {
|
|
87
|
+
if (val === null)
|
|
88
|
+
return null;
|
|
89
|
+
if (!val)
|
|
90
|
+
return undefined;
|
|
91
|
+
return new Date(val.substring(0, 4) + '-' + val.substring(4, 6) + '-' + val.substring(6, 8));
|
|
92
|
+
}
|
|
93
|
+
};
|
|
94
|
+
ValueConverters.Boolean = {
|
|
95
|
+
toDb: (val) => val,
|
|
96
|
+
inputType: InputTypes.checkbox,
|
|
97
|
+
fromDb: (value) => {
|
|
98
|
+
return ValueConverters.Boolean.fromJson(value);
|
|
99
|
+
},
|
|
100
|
+
fromJson: value => {
|
|
101
|
+
if (typeof value === "boolean")
|
|
102
|
+
return value;
|
|
103
|
+
if (value !== undefined && value !== null) {
|
|
104
|
+
return value.toString().trim().toLowerCase() == 'true';
|
|
105
|
+
}
|
|
106
|
+
return value;
|
|
107
|
+
},
|
|
108
|
+
toJson: x => x,
|
|
109
|
+
fromInput: x => ValueConverters.Boolean.fromJson(x),
|
|
110
|
+
toInput: x => ValueConverters.Boolean.toJson(x)
|
|
111
|
+
};
|
|
112
|
+
ValueConverters.Number = {
|
|
113
|
+
fromDb: value => {
|
|
114
|
+
if (value === null)
|
|
115
|
+
return null;
|
|
116
|
+
if (value !== undefined)
|
|
117
|
+
return +value;
|
|
118
|
+
return undefined;
|
|
119
|
+
},
|
|
120
|
+
toDb: value => value,
|
|
121
|
+
fromJson: value => ValueConverters.Number.fromDb(value),
|
|
122
|
+
toJson: value => ValueConverters.Number.toDb(value),
|
|
123
|
+
fromInput: (x, type) => {
|
|
124
|
+
let r = +x;
|
|
125
|
+
if (!x)
|
|
126
|
+
return undefined;
|
|
127
|
+
return r;
|
|
128
|
+
},
|
|
129
|
+
toInput: (x, type) => {
|
|
130
|
+
return x?.toString();
|
|
131
|
+
},
|
|
132
|
+
inputType: InputTypes.number
|
|
133
|
+
};
|
|
134
|
+
ValueConverters.Integer = {
|
|
135
|
+
...ValueConverters.Number,
|
|
136
|
+
toJson: value => {
|
|
137
|
+
let val = ValueConverters.Number.toDb(value);
|
|
138
|
+
if (!val)
|
|
139
|
+
return val;
|
|
140
|
+
return +(+val).toFixed(0);
|
|
141
|
+
},
|
|
142
|
+
toDb: value => ValueConverters.Integer.toJson(value),
|
|
143
|
+
fieldTypeInDb: 'integer'
|
|
144
|
+
};
|
|
145
|
+
ValueConverters.Default = {
|
|
146
|
+
fromJson: x => x,
|
|
147
|
+
toJson: x => x,
|
|
148
|
+
fromDb: x => ValueConverters.JsonString.fromDb(x),
|
|
149
|
+
toDb: x => ValueConverters.JsonString.toDb(x),
|
|
150
|
+
fromInput: x => ValueConverters.Default.fromJson(x),
|
|
151
|
+
toInput: x => ValueConverters.Default.toJson(x)
|
|
152
|
+
};
|
|
153
|
+
ValueConverters.JsonString = {
|
|
154
|
+
fromJson: x => x,
|
|
155
|
+
toJson: x => x,
|
|
156
|
+
fromDb: x => x == null ? null : x ? JSON.parse(ValueConverters.JsonString.fromJson(x)) : undefined,
|
|
157
|
+
toDb: x => x !== undefined ? x === null ? null : JSON.stringify(ValueConverters.JsonString.toJson(x)) : undefined,
|
|
158
|
+
fromInput: x => ValueConverters.JsonString.fromJson(x),
|
|
159
|
+
toInput: x => ValueConverters.JsonString.toJson(x)
|
|
160
|
+
};
|
|
161
|
+
ValueConverters.JsonValue = {
|
|
162
|
+
fromJson: x => x,
|
|
163
|
+
toJson: x => x,
|
|
164
|
+
fromDb: x => x,
|
|
165
|
+
toDb: x => x,
|
|
166
|
+
fromInput: x => ValueConverters.JsonString.fromJson(x),
|
|
167
|
+
toInput: x => ValueConverters.JsonString.toJson(x),
|
|
168
|
+
fieldTypeInDb: 'json'
|
|
169
|
+
};
|
package/package.json
CHANGED
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.postgresColumnSyntax = void 0;
|
|
4
|
+
var valueConverters_1 = require("../valueConverters");
|
|
5
|
+
function postgresColumnSyntax(x, dbName) {
|
|
6
|
+
var result = dbName;
|
|
7
|
+
if (x.valueType == Number) {
|
|
8
|
+
if (!x.valueConverter.fieldTypeInDb)
|
|
9
|
+
result += " numeric" + (x.allowNull ? "" : " default 0 not null");
|
|
10
|
+
else
|
|
11
|
+
result += " " + x.valueConverter.fieldTypeInDb + (x.allowNull ? "" : " default 0 not null");
|
|
12
|
+
}
|
|
13
|
+
else if (x.valueType == Date) {
|
|
14
|
+
if (!x.valueConverter.fieldTypeInDb)
|
|
15
|
+
if (x.valueConverter == valueConverters_1.ValueConverters.DateOnly)
|
|
16
|
+
result += " date";
|
|
17
|
+
else
|
|
18
|
+
result += " timestamp";
|
|
19
|
+
else
|
|
20
|
+
result += " " + x.valueConverter.fieldTypeInDb;
|
|
21
|
+
}
|
|
22
|
+
else if (x.valueType == Boolean)
|
|
23
|
+
result += " boolean" + (x.allowNull ? "" : " default false not null");
|
|
24
|
+
else if (x.valueConverter.fieldTypeInDb) {
|
|
25
|
+
result += " " + x.valueConverter.fieldTypeInDb;
|
|
26
|
+
if (!x.allowNull && x.valueConverter.fieldTypeInDb == 'integer') {
|
|
27
|
+
result += " default 0 not null";
|
|
28
|
+
}
|
|
29
|
+
}
|
|
30
|
+
else
|
|
31
|
+
result += " varchar" + (x.allowNull ? "" : " default '' not null");
|
|
32
|
+
return result;
|
|
33
|
+
}
|
|
34
|
+
exports.postgresColumnSyntax = postgresColumnSyntax;
|
|
@@ -0,0 +1,70 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.remultMiddleware = void 0;
|
|
4
|
+
var expressBridge_1 = require("./server/expressBridge");
|
|
5
|
+
function remultMiddleware(options) {
|
|
6
|
+
var m = new middleware();
|
|
7
|
+
var app = Object.assign(function (req, res, next) { return m.handleRequest(req, res, next); }, {
|
|
8
|
+
route: function (path) { return m.route(path); }
|
|
9
|
+
});
|
|
10
|
+
return expressBridge_1.remultMiddlewareBase(app, options);
|
|
11
|
+
}
|
|
12
|
+
exports.remultMiddleware = remultMiddleware;
|
|
13
|
+
var middleware = /** @class */ (function () {
|
|
14
|
+
function middleware() {
|
|
15
|
+
this.map = new Map();
|
|
16
|
+
}
|
|
17
|
+
middleware.prototype.route = function (path) {
|
|
18
|
+
//consider using:
|
|
19
|
+
//* https://raw.githubusercontent.com/cmorten/opine/main/src/utils/pathToRegex.ts
|
|
20
|
+
//* https://github.com/pillarjs/path-to-regexp
|
|
21
|
+
var r = path.toLowerCase();
|
|
22
|
+
var m = new Map();
|
|
23
|
+
this.map.set(r, m);
|
|
24
|
+
var route = {
|
|
25
|
+
get: function (h) {
|
|
26
|
+
m.set("get", h);
|
|
27
|
+
return route;
|
|
28
|
+
},
|
|
29
|
+
put: function (h) {
|
|
30
|
+
m.set("put", h);
|
|
31
|
+
return route;
|
|
32
|
+
},
|
|
33
|
+
post: function (h) {
|
|
34
|
+
m.set("post", h);
|
|
35
|
+
return route;
|
|
36
|
+
},
|
|
37
|
+
delete: function (h) {
|
|
38
|
+
m.set("delete", h);
|
|
39
|
+
return route;
|
|
40
|
+
}
|
|
41
|
+
};
|
|
42
|
+
return route;
|
|
43
|
+
};
|
|
44
|
+
middleware.prototype.handleRequest = function (req, res, next) {
|
|
45
|
+
var lowerPath = req.path.toLowerCase();
|
|
46
|
+
var m = this.map.get(lowerPath);
|
|
47
|
+
if (m) {
|
|
48
|
+
var h = m.get(req.method.toLowerCase());
|
|
49
|
+
if (h) {
|
|
50
|
+
h(req, res, next);
|
|
51
|
+
return;
|
|
52
|
+
}
|
|
53
|
+
}
|
|
54
|
+
var idPosition = req.path.lastIndexOf('/');
|
|
55
|
+
if (idPosition >= 0) {
|
|
56
|
+
lowerPath = req.path.substring(0, idPosition) + '/:id';
|
|
57
|
+
m = this.map.get(lowerPath);
|
|
58
|
+
if (m) {
|
|
59
|
+
var h = m.get(req.method.toLowerCase());
|
|
60
|
+
if (h) {
|
|
61
|
+
req.params.id = req.path.substring(idPosition + 1);
|
|
62
|
+
h(req, res, next);
|
|
63
|
+
return;
|
|
64
|
+
}
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
next();
|
|
68
|
+
};
|
|
69
|
+
return middleware;
|
|
70
|
+
}());
|
|
@@ -59,6 +59,8 @@ export interface GenericResponse {
|
|
|
59
59
|
}
|
|
60
60
|
export declare class RemultAsyncLocalStorage {
|
|
61
61
|
private readonly remultObjectStorage;
|
|
62
|
+
static enable(): void;
|
|
63
|
+
static disable(): void;
|
|
62
64
|
constructor(remultObjectStorage: import('async_hooks').AsyncLocalStorage<Remult>);
|
|
63
65
|
run(remult: Remult, callback: VoidFunction): void;
|
|
64
66
|
getRemult(): Remult;
|
package/server/expressBridge.js
CHANGED
|
@@ -40,6 +40,7 @@ function createRemultServer(options) {
|
|
|
40
40
|
}
|
|
41
41
|
});
|
|
42
42
|
}); });
|
|
43
|
+
RemultAsyncLocalStorage.enable();
|
|
43
44
|
if (options.initApi) {
|
|
44
45
|
dataProvider = dataProvider.then(function (dp) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
|
|
45
46
|
var remult;
|
|
@@ -90,6 +91,18 @@ var RemultAsyncLocalStorage = /** @class */ (function () {
|
|
|
90
91
|
function RemultAsyncLocalStorage(remultObjectStorage) {
|
|
91
92
|
this.remultObjectStorage = remultObjectStorage;
|
|
92
93
|
}
|
|
94
|
+
RemultAsyncLocalStorage.enable = function () {
|
|
95
|
+
remult_proxy_1.remult.remultFactory = function () {
|
|
96
|
+
var r = RemultAsyncLocalStorage.instance.getRemult();
|
|
97
|
+
if (r)
|
|
98
|
+
return r;
|
|
99
|
+
else
|
|
100
|
+
throw new Error("remult object was requested outside of a valid context, try running it within initApi or a remult request cycle");
|
|
101
|
+
};
|
|
102
|
+
};
|
|
103
|
+
RemultAsyncLocalStorage.disable = function () {
|
|
104
|
+
remult_proxy_1.remult.resetFactory();
|
|
105
|
+
};
|
|
93
106
|
RemultAsyncLocalStorage.prototype.run = function (remult, callback) {
|
|
94
107
|
if (this.remultObjectStorage)
|
|
95
108
|
this.remultObjectStorage.run(remult, callback);
|
|
@@ -98,7 +111,7 @@ var RemultAsyncLocalStorage = /** @class */ (function () {
|
|
|
98
111
|
};
|
|
99
112
|
RemultAsyncLocalStorage.prototype.getRemult = function () {
|
|
100
113
|
if (!this.remultObjectStorage) {
|
|
101
|
-
throw new Error("can't use static remult in this environment, `async_hooks` were not
|
|
114
|
+
throw new Error("can't use static remult in this environment, `async_hooks` were not initialized");
|
|
102
115
|
}
|
|
103
116
|
return this.remultObjectStorage.getStore();
|
|
104
117
|
};
|
|
@@ -106,13 +119,6 @@ var RemultAsyncLocalStorage = /** @class */ (function () {
|
|
|
106
119
|
return RemultAsyncLocalStorage;
|
|
107
120
|
}());
|
|
108
121
|
exports.RemultAsyncLocalStorage = RemultAsyncLocalStorage;
|
|
109
|
-
remult_proxy_1.remult.remultFactory = function () {
|
|
110
|
-
var r = RemultAsyncLocalStorage.instance.getRemult();
|
|
111
|
-
if (r)
|
|
112
|
-
return r;
|
|
113
|
-
else
|
|
114
|
-
throw new Error("remult object was requested outside of a valid context, try running it within initApi or a remult request cycle");
|
|
115
|
-
};
|
|
116
122
|
var RemultServerImplementation = /** @class */ (function () {
|
|
117
123
|
function RemultServerImplementation(queue, options, dataProvider) {
|
|
118
124
|
this.queue = queue;
|
package/server/initAsyncHooks.js
CHANGED
|
@@ -0,0 +1,50 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.registerActionsOnServer = void 0;
|
|
4
|
+
var tslib_1 = require("tslib");
|
|
5
|
+
var server_action_1 = require("../src/server-action");
|
|
6
|
+
function registerActionsOnServer(area, controllers) {
|
|
7
|
+
var e_1, _a, e_2, _b;
|
|
8
|
+
var addAction = function (a) {
|
|
9
|
+
var x = a[server_action_1.serverActionField];
|
|
10
|
+
if (!x) {
|
|
11
|
+
throw 'failed to set server action, did you forget the BackendMethod Decorator?';
|
|
12
|
+
}
|
|
13
|
+
area.addAction(x);
|
|
14
|
+
};
|
|
15
|
+
server_action_1.actionInfo.runningOnServer = true;
|
|
16
|
+
if (controllers && controllers.length > 0) {
|
|
17
|
+
try {
|
|
18
|
+
for (var controllers_1 = tslib_1.__values(controllers), controllers_1_1 = controllers_1.next(); !controllers_1_1.done; controllers_1_1 = controllers_1.next()) {
|
|
19
|
+
var c = controllers_1_1.value;
|
|
20
|
+
var z = c[server_action_1.classBackendMethodsArray];
|
|
21
|
+
if (z)
|
|
22
|
+
try {
|
|
23
|
+
for (var z_1 = (e_2 = void 0, tslib_1.__values(z)), z_1_1 = z_1.next(); !z_1_1.done; z_1_1 = z_1.next()) {
|
|
24
|
+
var a = z_1_1.value;
|
|
25
|
+
addAction(a);
|
|
26
|
+
}
|
|
27
|
+
}
|
|
28
|
+
catch (e_2_1) { e_2 = { error: e_2_1 }; }
|
|
29
|
+
finally {
|
|
30
|
+
try {
|
|
31
|
+
if (z_1_1 && !z_1_1.done && (_b = z_1.return)) _b.call(z_1);
|
|
32
|
+
}
|
|
33
|
+
finally { if (e_2) throw e_2.error; }
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
catch (e_1_1) { e_1 = { error: e_1_1 }; }
|
|
38
|
+
finally {
|
|
39
|
+
try {
|
|
40
|
+
if (controllers_1_1 && !controllers_1_1.done && (_a = controllers_1.return)) _a.call(controllers_1);
|
|
41
|
+
}
|
|
42
|
+
finally { if (e_1) throw e_1.error; }
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
else
|
|
46
|
+
server_action_1.actionInfo.allActions.forEach(function (a) {
|
|
47
|
+
addAction(a);
|
|
48
|
+
});
|
|
49
|
+
}
|
|
50
|
+
exports.registerActionsOnServer = registerActionsOnServer;
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.registerEntitiesOnServer = void 0;
|
|
4
|
+
var remult3_1 = require("../src/remult3");
|
|
5
|
+
var context_1 = require("../src/context");
|
|
6
|
+
var data_api_1 = require("../src/data-api");
|
|
7
|
+
function registerEntitiesOnServer(area, entities) {
|
|
8
|
+
if (!entities)
|
|
9
|
+
entities = context_1.allEntities;
|
|
10
|
+
//add Api Entries
|
|
11
|
+
entities.forEach(function (e) {
|
|
12
|
+
var key = remult3_1.getEntityKey(e);
|
|
13
|
+
if (key != undefined)
|
|
14
|
+
area.add(key, function (c) {
|
|
15
|
+
return new data_api_1.DataApi(c.repo(e), c);
|
|
16
|
+
});
|
|
17
|
+
});
|
|
18
|
+
}
|
|
19
|
+
exports.registerEntitiesOnServer = registerEntitiesOnServer;
|
|
@@ -1,11 +1,15 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
var tslib_1 = require("tslib");
|
|
4
|
+
var context_1 = require("../context");
|
|
4
5
|
var remult_knex_1 = require("../../remult-knex");
|
|
5
6
|
var dotenv_1 = require("dotenv");
|
|
6
7
|
var backend_database_test_setup_backend_spec_1 = require("./backend-database-test-setup.backend-spec");
|
|
7
8
|
var entityWithValidations_1 = require("../shared-tests/entityWithValidations");
|
|
8
9
|
var sql_database_1 = require("../data-providers/sql-database");
|
|
10
|
+
var expressBridge_1 = require("../../server/expressBridge");
|
|
11
|
+
var initAsyncHooks_1 = require("../../server/initAsyncHooks");
|
|
12
|
+
var remult_proxy_1 = require("../remult-proxy");
|
|
9
13
|
dotenv_1.config();
|
|
10
14
|
backend_database_test_setup_backend_spec_1.testPostgresImplementation("default order by", function (_a) {
|
|
11
15
|
var createEntity = _a.createEntity;
|
|
@@ -158,3 +162,56 @@ backend_database_test_setup_backend_spec_1.testKnexPGSqlImpl("knex filter2", fun
|
|
|
158
162
|
});
|
|
159
163
|
});
|
|
160
164
|
}, false);
|
|
165
|
+
it("test async hooks and static remult", function () { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
|
|
166
|
+
var gotException, promises;
|
|
167
|
+
return tslib_1.__generator(this, function (_a) {
|
|
168
|
+
switch (_a.label) {
|
|
169
|
+
case 0:
|
|
170
|
+
gotException = true;
|
|
171
|
+
try {
|
|
172
|
+
expressBridge_1.RemultAsyncLocalStorage.instance.getRemult();
|
|
173
|
+
gotException = false;
|
|
174
|
+
}
|
|
175
|
+
catch (_b) { }
|
|
176
|
+
expect(gotException).toBe(true);
|
|
177
|
+
initAsyncHooks_1.initAsyncHooks();
|
|
178
|
+
expect(expressBridge_1.RemultAsyncLocalStorage.instance.getRemult()).toBe(undefined);
|
|
179
|
+
expressBridge_1.RemultAsyncLocalStorage.enable();
|
|
180
|
+
try {
|
|
181
|
+
remult_proxy_1.remult.isAllowed(false);
|
|
182
|
+
gotException = false;
|
|
183
|
+
}
|
|
184
|
+
catch (_c) { }
|
|
185
|
+
expect(gotException).toBe(true);
|
|
186
|
+
promises = [];
|
|
187
|
+
expressBridge_1.RemultAsyncLocalStorage.instance.run(new context_1.Remult(), function () {
|
|
188
|
+
remult_proxy_1.remult.user = { id: 'noam' };
|
|
189
|
+
promises.push(new Promise(function (res) {
|
|
190
|
+
setTimeout(function () {
|
|
191
|
+
expect(remult_proxy_1.remult.user.id).toBe('noam');
|
|
192
|
+
res({});
|
|
193
|
+
}, 10);
|
|
194
|
+
}));
|
|
195
|
+
expressBridge_1.RemultAsyncLocalStorage.instance.run(new context_1.Remult(), function () {
|
|
196
|
+
remult_proxy_1.remult.user = { id: 'yoni' };
|
|
197
|
+
promises.push(new Promise(function (res) {
|
|
198
|
+
setTimeout(function () {
|
|
199
|
+
expect(remult_proxy_1.remult.user.id).toBe('yoni');
|
|
200
|
+
res({});
|
|
201
|
+
}, 10);
|
|
202
|
+
}));
|
|
203
|
+
});
|
|
204
|
+
promises.push(new Promise(function (res) {
|
|
205
|
+
setTimeout(function () {
|
|
206
|
+
expect(remult_proxy_1.remult.user.id).toBe('noam');
|
|
207
|
+
res({});
|
|
208
|
+
}, 10);
|
|
209
|
+
}));
|
|
210
|
+
});
|
|
211
|
+
return [4 /*yield*/, Promise.all(promises)];
|
|
212
|
+
case 1:
|
|
213
|
+
_a.sent();
|
|
214
|
+
return [2 /*return*/];
|
|
215
|
+
}
|
|
216
|
+
});
|
|
217
|
+
}); });
|
package/src/remult-proxy.js
CHANGED
|
@@ -60,6 +60,10 @@ var RemultProxy = /** @class */ (function () {
|
|
|
60
60
|
RemultProxy.prototype.clearAllCache = function () {
|
|
61
61
|
return this.remultFactory().clearAllCache();
|
|
62
62
|
};
|
|
63
|
+
/*@internal*/
|
|
64
|
+
RemultProxy.prototype.resetFactory = function () {
|
|
65
|
+
this.remultFactory = function () { return defaultRemult; };
|
|
66
|
+
};
|
|
63
67
|
Object.defineProperty(RemultProxy.prototype, "user", {
|
|
64
68
|
get: function () {
|
|
65
69
|
return this.remultFactory().user;
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
import { ValueConverter } from "./src/column-interfaces";
|
|
2
|
+
export declare class ValueConverters {
|
|
3
|
+
static readonly Date: ValueConverter<Date>;
|
|
4
|
+
static readonly DateOnly: ValueConverter<Date>;
|
|
5
|
+
static readonly DateOnlyString: ValueConverter<Date>;
|
|
6
|
+
static readonly Boolean: ValueConverter<Boolean>;
|
|
7
|
+
static readonly Number: ValueConverter<number>;
|
|
8
|
+
static readonly Integer: ValueConverter<number>;
|
|
9
|
+
static readonly Default: ValueConverter<any>;
|
|
10
|
+
static readonly JsonString: ValueConverter<any>;
|
|
11
|
+
static readonly JsonValue: ValueConverter<any>;
|
|
12
|
+
}
|
|
@@ -0,0 +1,168 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.ValueConverters = void 0;
|
|
4
|
+
var tslib_1 = require("tslib");
|
|
5
|
+
var inputTypes_1 = require("./inputTypes");
|
|
6
|
+
var ValueConverters = /** @class */ (function () {
|
|
7
|
+
function ValueConverters() {
|
|
8
|
+
}
|
|
9
|
+
ValueConverters.Date = {
|
|
10
|
+
toJson: function (val) {
|
|
11
|
+
if (!val)
|
|
12
|
+
return '';
|
|
13
|
+
if (typeof (val) === "string")
|
|
14
|
+
val = new Date(val);
|
|
15
|
+
if (val instanceof Date) {
|
|
16
|
+
return val.toISOString();
|
|
17
|
+
}
|
|
18
|
+
else {
|
|
19
|
+
console.log("ToJsonError", val);
|
|
20
|
+
throw new Error("Expected date but got val");
|
|
21
|
+
}
|
|
22
|
+
},
|
|
23
|
+
fromJson: function (val) {
|
|
24
|
+
if (val == undefined)
|
|
25
|
+
return undefined;
|
|
26
|
+
if (val == '')
|
|
27
|
+
return undefined;
|
|
28
|
+
if (val.startsWith('0000-00-00'))
|
|
29
|
+
return undefined;
|
|
30
|
+
return new Date(Date.parse(val));
|
|
31
|
+
},
|
|
32
|
+
toDb: function (x) { return x; },
|
|
33
|
+
fromDb: function (x) { return x; },
|
|
34
|
+
fromInput: function (x) { return ValueConverters.Date.fromJson(x); },
|
|
35
|
+
toInput: function (x) { return ValueConverters.Date.toJson(x); },
|
|
36
|
+
displayValue: function (val) {
|
|
37
|
+
if (!val)
|
|
38
|
+
return '';
|
|
39
|
+
return val.toLocaleString();
|
|
40
|
+
}
|
|
41
|
+
};
|
|
42
|
+
ValueConverters.DateOnly = {
|
|
43
|
+
fromInput: function (x) { return ValueConverters.DateOnly.fromJson(x); },
|
|
44
|
+
toInput: function (x) { return ValueConverters.DateOnly.toJson(x); },
|
|
45
|
+
toJson: function (val) {
|
|
46
|
+
var d = val;
|
|
47
|
+
if (typeof d === "string" || typeof (d) === "number")
|
|
48
|
+
d = new Date(d);
|
|
49
|
+
if (!d || d == null)
|
|
50
|
+
return null;
|
|
51
|
+
if (d.getHours() == 0)
|
|
52
|
+
return new Date(d.valueOf() - d.getTimezoneOffset() * 60000).toISOString().substring(0, 10);
|
|
53
|
+
else
|
|
54
|
+
return d.toISOString().substring(0, 10);
|
|
55
|
+
},
|
|
56
|
+
fromJson: function (value) {
|
|
57
|
+
if (!value || value == '' || value == '0000-00-00')
|
|
58
|
+
return null;
|
|
59
|
+
var d = new Date(Date.parse(value));
|
|
60
|
+
d.setMinutes(d.getMinutes() + d.getTimezoneOffset());
|
|
61
|
+
return d;
|
|
62
|
+
},
|
|
63
|
+
inputType: inputTypes_1.InputTypes.date,
|
|
64
|
+
toDb: function (val) {
|
|
65
|
+
if (!val)
|
|
66
|
+
return null;
|
|
67
|
+
return ValueConverters.DateOnly.fromJson(ValueConverters.DateOnly.toJson(val));
|
|
68
|
+
} //when using date storage, the database expects and returns a date local and every where else we reflect on date iso
|
|
69
|
+
,
|
|
70
|
+
fromDb: function (val) {
|
|
71
|
+
var d = val;
|
|
72
|
+
if (!d)
|
|
73
|
+
return null;
|
|
74
|
+
return val;
|
|
75
|
+
},
|
|
76
|
+
fieldTypeInDb: 'date',
|
|
77
|
+
displayValue: function (value) {
|
|
78
|
+
if (!value)
|
|
79
|
+
return '';
|
|
80
|
+
return value.toLocaleDateString(undefined);
|
|
81
|
+
}
|
|
82
|
+
};
|
|
83
|
+
ValueConverters.DateOnlyString = tslib_1.__assign(tslib_1.__assign({}, ValueConverters.DateOnly), { toDb: function (d) {
|
|
84
|
+
var val = ValueConverters.DateOnly.toJson(d);
|
|
85
|
+
if (!val)
|
|
86
|
+
return undefined;
|
|
87
|
+
return val.replace(/-/g, '');
|
|
88
|
+
}, fromDb: function (val) {
|
|
89
|
+
if (val === null)
|
|
90
|
+
return null;
|
|
91
|
+
if (!val)
|
|
92
|
+
return undefined;
|
|
93
|
+
return new Date(val.substring(0, 4) + '-' + val.substring(4, 6) + '-' + val.substring(6, 8));
|
|
94
|
+
} });
|
|
95
|
+
ValueConverters.Boolean = {
|
|
96
|
+
toDb: function (val) { return val; },
|
|
97
|
+
inputType: inputTypes_1.InputTypes.checkbox,
|
|
98
|
+
fromDb: function (value) {
|
|
99
|
+
return ValueConverters.Boolean.fromJson(value);
|
|
100
|
+
},
|
|
101
|
+
fromJson: function (value) {
|
|
102
|
+
if (typeof value === "boolean")
|
|
103
|
+
return value;
|
|
104
|
+
if (value !== undefined && value !== null) {
|
|
105
|
+
return value.toString().trim().toLowerCase() == 'true';
|
|
106
|
+
}
|
|
107
|
+
return value;
|
|
108
|
+
},
|
|
109
|
+
toJson: function (x) { return x; },
|
|
110
|
+
fromInput: function (x) { return ValueConverters.Boolean.fromJson(x); },
|
|
111
|
+
toInput: function (x) { return ValueConverters.Boolean.toJson(x); }
|
|
112
|
+
};
|
|
113
|
+
ValueConverters.Number = {
|
|
114
|
+
fromDb: function (value) {
|
|
115
|
+
if (value === null)
|
|
116
|
+
return null;
|
|
117
|
+
if (value !== undefined)
|
|
118
|
+
return +value;
|
|
119
|
+
return undefined;
|
|
120
|
+
},
|
|
121
|
+
toDb: function (value) { return value; },
|
|
122
|
+
fromJson: function (value) { return ValueConverters.Number.fromDb(value); },
|
|
123
|
+
toJson: function (value) { return ValueConverters.Number.toDb(value); },
|
|
124
|
+
fromInput: function (x, type) {
|
|
125
|
+
var r = +x;
|
|
126
|
+
if (!x)
|
|
127
|
+
return undefined;
|
|
128
|
+
return r;
|
|
129
|
+
},
|
|
130
|
+
toInput: function (x, type) {
|
|
131
|
+
return x === null || x === void 0 ? void 0 : x.toString();
|
|
132
|
+
},
|
|
133
|
+
inputType: inputTypes_1.InputTypes.number
|
|
134
|
+
};
|
|
135
|
+
ValueConverters.Integer = tslib_1.__assign(tslib_1.__assign({}, ValueConverters.Number), { toJson: function (value) {
|
|
136
|
+
var val = ValueConverters.Number.toDb(value);
|
|
137
|
+
if (!val)
|
|
138
|
+
return val;
|
|
139
|
+
return +(+val).toFixed(0);
|
|
140
|
+
}, toDb: function (value) { return ValueConverters.Integer.toJson(value); }, fieldTypeInDb: 'integer' });
|
|
141
|
+
ValueConverters.Default = {
|
|
142
|
+
fromJson: function (x) { return x; },
|
|
143
|
+
toJson: function (x) { return x; },
|
|
144
|
+
fromDb: function (x) { return ValueConverters.JsonString.fromDb(x); },
|
|
145
|
+
toDb: function (x) { return ValueConverters.JsonString.toDb(x); },
|
|
146
|
+
fromInput: function (x) { return ValueConverters.Default.fromJson(x); },
|
|
147
|
+
toInput: function (x) { return ValueConverters.Default.toJson(x); }
|
|
148
|
+
};
|
|
149
|
+
ValueConverters.JsonString = {
|
|
150
|
+
fromJson: function (x) { return x; },
|
|
151
|
+
toJson: function (x) { return x; },
|
|
152
|
+
fromDb: function (x) { return x == null ? null : x ? JSON.parse(ValueConverters.JsonString.fromJson(x)) : undefined; },
|
|
153
|
+
toDb: function (x) { return x !== undefined ? x === null ? null : JSON.stringify(ValueConverters.JsonString.toJson(x)) : undefined; },
|
|
154
|
+
fromInput: function (x) { return ValueConverters.JsonString.fromJson(x); },
|
|
155
|
+
toInput: function (x) { return ValueConverters.JsonString.toJson(x); }
|
|
156
|
+
};
|
|
157
|
+
ValueConverters.JsonValue = {
|
|
158
|
+
fromJson: function (x) { return x; },
|
|
159
|
+
toJson: function (x) { return x; },
|
|
160
|
+
fromDb: function (x) { return x; },
|
|
161
|
+
toDb: function (x) { return x; },
|
|
162
|
+
fromInput: function (x) { return ValueConverters.JsonString.fromJson(x); },
|
|
163
|
+
toInput: function (x) { return ValueConverters.JsonString.toJson(x); },
|
|
164
|
+
fieldTypeInDb: 'json'
|
|
165
|
+
};
|
|
166
|
+
return ValueConverters;
|
|
167
|
+
}());
|
|
168
|
+
exports.ValueConverters = ValueConverters;
|