remult 0.16.0-exp.9 → 0.16.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.
- package/esm/postgres/postgresColumnSyntax.d.ts +2 -0
- package/esm/postgres/postgresColumnSyntax.js +30 -0
- package/esm/remult-express.js +1 -1
- package/esm/remult-fastify.js +2 -1
- package/esm/remult-middleware.d.ts +2 -0
- package/esm/remult-middleware.js +65 -0
- package/esm/server/expressBridge.d.ts +1 -1
- package/esm/server/expressBridge.js +38 -14
- 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/test-http-server.backend-spec.js +4 -6
- package/esm/src/context.d.ts +2 -2
- package/esm/src/data-providers/rest-data-provider.d.ts +4 -1
- package/esm/src/data-providers/rest-data-provider.js +17 -10
- package/esm/src/remult3/RepositoryImplementation.js +1 -1
- 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-express.js +2 -2
- package/remult-fastify.js +2 -1
- package/remult-middleware.d.ts +2 -0
- package/remult-middleware.js +70 -0
- package/server/expressBridge.d.ts +1 -1
- package/server/expressBridge.js +49 -14
- 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/test-http-server.backend-spec.js +7 -9
- package/src/context.d.ts +2 -2
- package/src/data-providers/rest-data-provider.d.ts +4 -1
- package/src/data-providers/rest-data-provider.js +28 -10
- package/src/remult3/RepositoryImplementation.js +1 -1
- 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
|
+
}
|
package/esm/remult-express.js
CHANGED
|
@@ -18,6 +18,6 @@ export function remultExpress(options) {
|
|
|
18
18
|
getRemult: (req) => server.getRemult(req),
|
|
19
19
|
openApiDoc: (options) => server.openApiDoc(options),
|
|
20
20
|
registerRouter: x => server.registerRouter(x),
|
|
21
|
-
|
|
21
|
+
withRemult: (...args) => server.withRemult(...args)
|
|
22
22
|
});
|
|
23
23
|
}
|
package/esm/remult-fastify.js
CHANGED
|
@@ -47,6 +47,7 @@ export function remultFastify(options) {
|
|
|
47
47
|
return Object.assign(pluginFunction, {
|
|
48
48
|
getRemult: x => api.getRemult(x),
|
|
49
49
|
openApiDoc: x => api.openApiDoc(x),
|
|
50
|
-
handle: (req, res) => api.handle(req, res)
|
|
50
|
+
handle: (req, res) => api.handle(req, res),
|
|
51
|
+
withRemult: (req, res, next) => api.withRemult(req, res, next)
|
|
51
52
|
});
|
|
52
53
|
}
|
|
@@ -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
|
+
}
|
|
@@ -33,7 +33,7 @@ export interface RemultServer {
|
|
|
33
33
|
}): any;
|
|
34
34
|
registerRouter(r: GenericRouter): void;
|
|
35
35
|
handle(req: GenericRequest, gRes?: GenericResponse): Promise<ServerHandleResponse | undefined>;
|
|
36
|
-
|
|
36
|
+
withRemult(req: GenericRequest, res: GenericResponse, next: VoidFunction): any;
|
|
37
37
|
}
|
|
38
38
|
export declare type GenericRouter = {
|
|
39
39
|
route(path: string): SpecificRoute;
|
|
@@ -4,7 +4,6 @@ import { DataApi, serializeError } from '../src/data-api';
|
|
|
4
4
|
import { allEntities, Remult } from '../src/context';
|
|
5
5
|
import { Entity, Fields, getEntityKey } from '../src/remult3';
|
|
6
6
|
import { IdEntity } from '../src/id-entity';
|
|
7
|
-
import { AsyncLocalStorage } from 'async_hooks';
|
|
8
7
|
import { remult } from '../src/remult-proxy';
|
|
9
8
|
;
|
|
10
9
|
export function createRemultServer(options) {
|
|
@@ -31,6 +30,25 @@ export function createRemultServer(options) {
|
|
|
31
30
|
return dp;
|
|
32
31
|
return new (await import('./JsonEntityFileStorage')).JsonFileDataProvider('./db');
|
|
33
32
|
});
|
|
33
|
+
if (!remultObjectStorage) {
|
|
34
|
+
dataProvider = dataProvider.then(async (dp) => {
|
|
35
|
+
try {
|
|
36
|
+
const asyncHooks = await import('async_hooks');
|
|
37
|
+
remultObjectStorage = new RemultAsyncLocalStorage(new asyncHooks.AsyncLocalStorage());
|
|
38
|
+
}
|
|
39
|
+
catch {
|
|
40
|
+
remultObjectStorage = new RemultAsyncLocalStorage(undefined);
|
|
41
|
+
}
|
|
42
|
+
remult.remultFactory = () => {
|
|
43
|
+
const r = remultObjectStorage.getRemult();
|
|
44
|
+
if (r)
|
|
45
|
+
return r;
|
|
46
|
+
else
|
|
47
|
+
throw new Error("remult object was requested outside of a valid context, try running it within initApi or a remult request cycle");
|
|
48
|
+
};
|
|
49
|
+
return dp;
|
|
50
|
+
});
|
|
51
|
+
}
|
|
34
52
|
if (options.initApi) {
|
|
35
53
|
dataProvider = dataProvider.then(async (dp) => {
|
|
36
54
|
var remult = new Remult(dp);
|
|
@@ -60,8 +78,24 @@ export function createRemultServer(options) {
|
|
|
60
78
|
return bridge;
|
|
61
79
|
}
|
|
62
80
|
;
|
|
63
|
-
|
|
64
|
-
|
|
81
|
+
class RemultAsyncLocalStorage {
|
|
82
|
+
constructor(remultObjectStorage) {
|
|
83
|
+
this.remultObjectStorage = remultObjectStorage;
|
|
84
|
+
}
|
|
85
|
+
run(remult, callback) {
|
|
86
|
+
if (this.remultObjectStorage)
|
|
87
|
+
this.remultObjectStorage.run(remult, callback);
|
|
88
|
+
else
|
|
89
|
+
callback();
|
|
90
|
+
}
|
|
91
|
+
getRemult() {
|
|
92
|
+
if (!this.remultObjectStorage) {
|
|
93
|
+
throw "can't use static remult in this environment, `async_hooks` were not found";
|
|
94
|
+
}
|
|
95
|
+
return this.remultObjectStorage.getStore();
|
|
96
|
+
}
|
|
97
|
+
}
|
|
98
|
+
let remultObjectStorage;
|
|
65
99
|
class RemultServerImplementation {
|
|
66
100
|
constructor(queue, options, dataProvider) {
|
|
67
101
|
this.queue = queue;
|
|
@@ -71,18 +105,8 @@ class RemultServerImplementation {
|
|
|
71
105
|
this.hasQueue = false;
|
|
72
106
|
/* internal */
|
|
73
107
|
this.backendMethodsOpenApi = [];
|
|
74
|
-
if (!remultObjectStorageWasSetup) {
|
|
75
|
-
remultObjectStorageWasSetup = true;
|
|
76
|
-
remult.remultFactory = () => {
|
|
77
|
-
const r = remultObjectStorage.getStore();
|
|
78
|
-
if (r)
|
|
79
|
-
return r;
|
|
80
|
-
else
|
|
81
|
-
throw new Error("remult object was requested outside of a valid context, try running it within initApi or a remult request cycle");
|
|
82
|
-
};
|
|
83
|
-
}
|
|
84
108
|
}
|
|
85
|
-
|
|
109
|
+
withRemult(req, res, next) {
|
|
86
110
|
this.process(async () => { next(); })(req, res);
|
|
87
111
|
}
|
|
88
112
|
handle(req, gRes) {
|
|
@@ -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,7 +1,6 @@
|
|
|
1
1
|
import { __decorate, __metadata } from "tslib";
|
|
2
2
|
import axios from 'axios';
|
|
3
3
|
import { remultFresh } from '../../remult-fresh';
|
|
4
|
-
import { Remult } from '../context';
|
|
5
4
|
import { InMemoryDataProvider } from '../data-providers/in-memory-database';
|
|
6
5
|
import { remult } from '../remult-proxy';
|
|
7
6
|
import { Entity, Fields } from '../remult3';
|
|
@@ -12,10 +11,10 @@ let path = remult.apiClient.url + '/tasks';
|
|
|
12
11
|
const environments = [
|
|
13
12
|
// ["next", 3000],
|
|
14
13
|
// ["nest", 3001],
|
|
15
|
-
//
|
|
16
|
-
//
|
|
17
|
-
//
|
|
18
|
-
//
|
|
14
|
+
// ["koa", 3002],
|
|
15
|
+
// ["fastify", 3003],
|
|
16
|
+
// ["express", 3004],
|
|
17
|
+
// ["generic server", 3005],
|
|
19
18
|
// ["optine", 3006],
|
|
20
19
|
// ["fresh", 8000]
|
|
21
20
|
];
|
|
@@ -160,7 +159,6 @@ Task = __decorate([
|
|
|
160
159
|
], Task);
|
|
161
160
|
export { Task };
|
|
162
161
|
async function create3Tasks() {
|
|
163
|
-
const remult = new Remult(axios);
|
|
164
162
|
remult.apiClient.httpClient = axios;
|
|
165
163
|
const taskRepo = remult.repo(Task);
|
|
166
164
|
for (const task of await taskRepo.find()) {
|
package/esm/src/context.d.ts
CHANGED
|
@@ -94,8 +94,8 @@ export declare function buildRestDataProvider(provider: ExternalHttpProvider | t
|
|
|
94
94
|
export declare function setControllerSettings(target: any, options: ControllerOptions): void;
|
|
95
95
|
export interface UserInfo {
|
|
96
96
|
id: string;
|
|
97
|
-
name
|
|
98
|
-
roles
|
|
97
|
+
name?: string;
|
|
98
|
+
roles?: string[];
|
|
99
99
|
}
|
|
100
100
|
export declare type Allowed = boolean | string | string[] | ((c: Remult) => boolean);
|
|
101
101
|
export declare type AllowedForInstance<T> = boolean | string | string[] | ((c: Remult, entity?: T) => boolean);
|
|
@@ -30,6 +30,9 @@ export declare class RestDataProviderHttpProviderUsingFetch implements RestDataP
|
|
|
30
30
|
put(url: string, data: any): Promise<any>;
|
|
31
31
|
delete(url: string): Promise<any>;
|
|
32
32
|
post(url: string, data: any): Promise<any>;
|
|
33
|
-
myFetch(url: string,
|
|
33
|
+
myFetch(url: string, options?: {
|
|
34
|
+
method?: string;
|
|
35
|
+
body?: string;
|
|
36
|
+
}): Promise<any>;
|
|
34
37
|
}
|
|
35
38
|
export declare function addFilterToUrlAndReturnTrueIfSuccessful(filter: any, url: UrlBuilder): boolean;
|
|
@@ -122,7 +122,7 @@ export class RestDataProviderHttpProviderUsingFetch {
|
|
|
122
122
|
});
|
|
123
123
|
}
|
|
124
124
|
delete(url) {
|
|
125
|
-
return this.myFetch(url, { method: 'delete'
|
|
125
|
+
return this.myFetch(url, { method: 'delete' });
|
|
126
126
|
}
|
|
127
127
|
async post(url, data) {
|
|
128
128
|
return await retry(() => this.myFetch(url, {
|
|
@@ -130,15 +130,22 @@ export class RestDataProviderHttpProviderUsingFetch {
|
|
|
130
130
|
body: JSON.stringify(data)
|
|
131
131
|
}));
|
|
132
132
|
}
|
|
133
|
-
myFetch(url,
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
133
|
+
myFetch(url, options) {
|
|
134
|
+
const headers = {
|
|
135
|
+
"Content-type": "application/json"
|
|
136
|
+
};
|
|
137
|
+
if (typeof window !== 'undefined' && typeof window.document !== 'undefined' && typeof (window.document.cookie !== 'undefined'))
|
|
138
|
+
for (const cookie of window.document.cookie.split(';')) {
|
|
139
|
+
if (cookie.trim().startsWith('XSRF-TOKEN=')) {
|
|
140
|
+
headers['X-XSRF-TOKEN'] = cookie.split('=')[1];
|
|
141
|
+
}
|
|
142
|
+
}
|
|
143
|
+
return (this.fetch || fetch)(url, {
|
|
144
|
+
credentials: 'include',
|
|
145
|
+
method: options?.method,
|
|
146
|
+
body: options?.body,
|
|
147
|
+
headers
|
|
148
|
+
}).then(response => {
|
|
142
149
|
return onSuccess(response);
|
|
143
150
|
}).catch(async (error) => {
|
|
144
151
|
let r = await error;
|
|
@@ -693,7 +693,7 @@ export class rowHelperImplementation extends rowHelperBase {
|
|
|
693
693
|
this.metadata = info;
|
|
694
694
|
if (_isNew) {
|
|
695
695
|
for (const col of info.columnsInfo) {
|
|
696
|
-
if (col.defaultValue) {
|
|
696
|
+
if (col.defaultValue && instance[col.key] === undefined) {
|
|
697
697
|
if (typeof col.defaultValue === "function") {
|
|
698
698
|
instance[col.key] = col.defaultValue(instance);
|
|
699
699
|
}
|
|
@@ -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;
|
package/remult-express.js
CHANGED
|
@@ -22,12 +22,12 @@ function remultExpress(options) {
|
|
|
22
22
|
getRemult: function (req) { return server.getRemult(req); },
|
|
23
23
|
openApiDoc: function (options) { return server.openApiDoc(options); },
|
|
24
24
|
registerRouter: function (x) { return server.registerRouter(x); },
|
|
25
|
-
|
|
25
|
+
withRemult: function () {
|
|
26
26
|
var args = [];
|
|
27
27
|
for (var _i = 0; _i < arguments.length; _i++) {
|
|
28
28
|
args[_i] = arguments[_i];
|
|
29
29
|
}
|
|
30
|
-
return server.
|
|
30
|
+
return server.withRemult.apply(server, tslib_1.__spread(args));
|
|
31
31
|
}
|
|
32
32
|
});
|
|
33
33
|
}
|
package/remult-fastify.js
CHANGED
|
@@ -55,7 +55,8 @@ function remultFastify(options) {
|
|
|
55
55
|
return Object.assign(pluginFunction, {
|
|
56
56
|
getRemult: function (x) { return api.getRemult(x); },
|
|
57
57
|
openApiDoc: function (x) { return api.openApiDoc(x); },
|
|
58
|
-
handle: function (req, res) { return api.handle(req, res); }
|
|
58
|
+
handle: function (req, res) { return api.handle(req, res); },
|
|
59
|
+
withRemult: function (req, res, next) { return api.withRemult(req, res, next); }
|
|
59
60
|
});
|
|
60
61
|
}
|
|
61
62
|
exports.remultFastify = remultFastify;
|
|
@@ -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
|
+
}());
|
|
@@ -33,7 +33,7 @@ export interface RemultServer {
|
|
|
33
33
|
}): any;
|
|
34
34
|
registerRouter(r: GenericRouter): void;
|
|
35
35
|
handle(req: GenericRequest, gRes?: GenericResponse): Promise<ServerHandleResponse | undefined>;
|
|
36
|
-
|
|
36
|
+
withRemult(req: GenericRequest, res: GenericResponse, next: VoidFunction): any;
|
|
37
37
|
}
|
|
38
38
|
export declare type GenericRouter = {
|
|
39
39
|
route(path: string): SpecificRoute;
|
package/server/expressBridge.js
CHANGED
|
@@ -7,7 +7,6 @@ var data_api_1 = require("../src/data-api");
|
|
|
7
7
|
var context_1 = require("../src/context");
|
|
8
8
|
var remult3_1 = require("../src/remult3");
|
|
9
9
|
var id_entity_1 = require("../src/id-entity");
|
|
10
|
-
var async_hooks_1 = require("async_hooks");
|
|
11
10
|
var remult_proxy_1 = require("../src/remult-proxy");
|
|
12
11
|
;
|
|
13
12
|
function createRemultServer(options) {
|
|
@@ -41,6 +40,35 @@ function createRemultServer(options) {
|
|
|
41
40
|
}
|
|
42
41
|
});
|
|
43
42
|
}); });
|
|
43
|
+
if (!remultObjectStorage) {
|
|
44
|
+
dataProvider = dataProvider.then(function (dp) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
|
|
45
|
+
var asyncHooks, _a;
|
|
46
|
+
return tslib_1.__generator(this, function (_b) {
|
|
47
|
+
switch (_b.label) {
|
|
48
|
+
case 0:
|
|
49
|
+
_b.trys.push([0, 2, , 3]);
|
|
50
|
+
return [4 /*yield*/, Promise.resolve().then(function () { return require('async_hooks'); })];
|
|
51
|
+
case 1:
|
|
52
|
+
asyncHooks = _b.sent();
|
|
53
|
+
remultObjectStorage = new RemultAsyncLocalStorage(new asyncHooks.AsyncLocalStorage());
|
|
54
|
+
return [3 /*break*/, 3];
|
|
55
|
+
case 2:
|
|
56
|
+
_a = _b.sent();
|
|
57
|
+
remultObjectStorage = new RemultAsyncLocalStorage(undefined);
|
|
58
|
+
return [3 /*break*/, 3];
|
|
59
|
+
case 3:
|
|
60
|
+
remult_proxy_1.remult.remultFactory = function () {
|
|
61
|
+
var r = remultObjectStorage.getRemult();
|
|
62
|
+
if (r)
|
|
63
|
+
return r;
|
|
64
|
+
else
|
|
65
|
+
throw new Error("remult object was requested outside of a valid context, try running it within initApi or a remult request cycle");
|
|
66
|
+
};
|
|
67
|
+
return [2 /*return*/, dp];
|
|
68
|
+
}
|
|
69
|
+
});
|
|
70
|
+
}); });
|
|
71
|
+
}
|
|
44
72
|
if (options.initApi) {
|
|
45
73
|
dataProvider = dataProvider.then(function (dp) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
|
|
46
74
|
var remult;
|
|
@@ -87,8 +115,25 @@ function createRemultServer(options) {
|
|
|
87
115
|
}
|
|
88
116
|
exports.createRemultServer = createRemultServer;
|
|
89
117
|
;
|
|
90
|
-
var
|
|
91
|
-
|
|
118
|
+
var RemultAsyncLocalStorage = /** @class */ (function () {
|
|
119
|
+
function RemultAsyncLocalStorage(remultObjectStorage) {
|
|
120
|
+
this.remultObjectStorage = remultObjectStorage;
|
|
121
|
+
}
|
|
122
|
+
RemultAsyncLocalStorage.prototype.run = function (remult, callback) {
|
|
123
|
+
if (this.remultObjectStorage)
|
|
124
|
+
this.remultObjectStorage.run(remult, callback);
|
|
125
|
+
else
|
|
126
|
+
callback();
|
|
127
|
+
};
|
|
128
|
+
RemultAsyncLocalStorage.prototype.getRemult = function () {
|
|
129
|
+
if (!this.remultObjectStorage) {
|
|
130
|
+
throw "can't use static remult in this environment, `async_hooks` were not found";
|
|
131
|
+
}
|
|
132
|
+
return this.remultObjectStorage.getStore();
|
|
133
|
+
};
|
|
134
|
+
return RemultAsyncLocalStorage;
|
|
135
|
+
}());
|
|
136
|
+
var remultObjectStorage;
|
|
92
137
|
var RemultServerImplementation = /** @class */ (function () {
|
|
93
138
|
function RemultServerImplementation(queue, options, dataProvider) {
|
|
94
139
|
this.queue = queue;
|
|
@@ -98,18 +143,8 @@ var RemultServerImplementation = /** @class */ (function () {
|
|
|
98
143
|
this.hasQueue = false;
|
|
99
144
|
/* internal */
|
|
100
145
|
this.backendMethodsOpenApi = [];
|
|
101
|
-
if (!remultObjectStorageWasSetup) {
|
|
102
|
-
remultObjectStorageWasSetup = true;
|
|
103
|
-
remult_proxy_1.remult.remultFactory = function () {
|
|
104
|
-
var r = remultObjectStorage.getStore();
|
|
105
|
-
if (r)
|
|
106
|
-
return r;
|
|
107
|
-
else
|
|
108
|
-
throw new Error("remult object was requested outside of a valid context, try running it within initApi or a remult request cycle");
|
|
109
|
-
};
|
|
110
|
-
}
|
|
111
146
|
}
|
|
112
|
-
RemultServerImplementation.prototype.
|
|
147
|
+
RemultServerImplementation.prototype.withRemult = function (req, res, next) {
|
|
113
148
|
var _this = this;
|
|
114
149
|
this.process(function () { return tslib_1.__awaiter(_this, void 0, void 0, function () { return tslib_1.__generator(this, function (_a) {
|
|
115
150
|
next();
|
|
@@ -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;
|
|
@@ -4,7 +4,6 @@ exports.Task = void 0;
|
|
|
4
4
|
var tslib_1 = require("tslib");
|
|
5
5
|
var axios_1 = require("axios");
|
|
6
6
|
var remult_fresh_1 = require("../../remult-fresh");
|
|
7
|
-
var context_1 = require("../context");
|
|
8
7
|
var in_memory_database_1 = require("../data-providers/in-memory-database");
|
|
9
8
|
var remult_proxy_1 = require("../remult-proxy");
|
|
10
9
|
var remult3_1 = require("../remult3");
|
|
@@ -15,10 +14,10 @@ var path = remult_proxy_1.remult.apiClient.url + '/tasks';
|
|
|
15
14
|
var environments = [
|
|
16
15
|
// ["next", 3000],
|
|
17
16
|
// ["nest", 3001],
|
|
18
|
-
//
|
|
19
|
-
//
|
|
20
|
-
//
|
|
21
|
-
//
|
|
17
|
+
// ["koa", 3002],
|
|
18
|
+
// ["fastify", 3003],
|
|
19
|
+
// ["express", 3004],
|
|
20
|
+
// ["generic server", 3005],
|
|
22
21
|
// ["optine", 3006],
|
|
23
22
|
// ["fresh", 8000]
|
|
24
23
|
];
|
|
@@ -289,14 +288,13 @@ var Task = /** @class */ (function () {
|
|
|
289
288
|
exports.Task = Task;
|
|
290
289
|
function create3Tasks() {
|
|
291
290
|
return tslib_1.__awaiter(this, void 0, void 0, function () {
|
|
292
|
-
var
|
|
291
|
+
var taskRepo, _a, _b, task, e_2_1, _c, _d;
|
|
293
292
|
var e_2, _e;
|
|
294
293
|
return tslib_1.__generator(this, function (_f) {
|
|
295
294
|
switch (_f.label) {
|
|
296
295
|
case 0:
|
|
297
|
-
remult =
|
|
298
|
-
|
|
299
|
-
taskRepo = remult.repo(Task);
|
|
296
|
+
remult_proxy_1.remult.apiClient.httpClient = axios_1.default;
|
|
297
|
+
taskRepo = remult_proxy_1.remult.repo(Task);
|
|
300
298
|
_f.label = 1;
|
|
301
299
|
case 1:
|
|
302
300
|
_f.trys.push([1, 7, 8, 9]);
|
package/src/context.d.ts
CHANGED
|
@@ -94,8 +94,8 @@ export declare function buildRestDataProvider(provider: ExternalHttpProvider | t
|
|
|
94
94
|
export declare function setControllerSettings(target: any, options: ControllerOptions): void;
|
|
95
95
|
export interface UserInfo {
|
|
96
96
|
id: string;
|
|
97
|
-
name
|
|
98
|
-
roles
|
|
97
|
+
name?: string;
|
|
98
|
+
roles?: string[];
|
|
99
99
|
}
|
|
100
100
|
export declare type Allowed = boolean | string | string[] | ((c: Remult) => boolean);
|
|
101
101
|
export declare type AllowedForInstance<T> = boolean | string | string[] | ((c: Remult, entity?: T) => boolean);
|
|
@@ -30,6 +30,9 @@ export declare class RestDataProviderHttpProviderUsingFetch implements RestDataP
|
|
|
30
30
|
put(url: string, data: any): Promise<any>;
|
|
31
31
|
delete(url: string): Promise<any>;
|
|
32
32
|
post(url: string, data: any): Promise<any>;
|
|
33
|
-
myFetch(url: string,
|
|
33
|
+
myFetch(url: string, options?: {
|
|
34
|
+
method?: string;
|
|
35
|
+
body?: string;
|
|
36
|
+
}): Promise<any>;
|
|
34
37
|
}
|
|
35
38
|
export declare function addFilterToUrlAndReturnTrueIfSuccessful(filter: any, url: UrlBuilder): boolean;
|
|
@@ -189,7 +189,7 @@ var RestDataProviderHttpProviderUsingFetch = /** @class */ (function () {
|
|
|
189
189
|
});
|
|
190
190
|
};
|
|
191
191
|
RestDataProviderHttpProviderUsingFetch.prototype.delete = function (url) {
|
|
192
|
-
return this.myFetch(url, { method: 'delete'
|
|
192
|
+
return this.myFetch(url, { method: 'delete' });
|
|
193
193
|
};
|
|
194
194
|
RestDataProviderHttpProviderUsingFetch.prototype.post = function (url, data) {
|
|
195
195
|
return tslib_1.__awaiter(this, void 0, void 0, function () {
|
|
@@ -205,16 +205,34 @@ var RestDataProviderHttpProviderUsingFetch = /** @class */ (function () {
|
|
|
205
205
|
});
|
|
206
206
|
});
|
|
207
207
|
};
|
|
208
|
-
RestDataProviderHttpProviderUsingFetch.prototype.myFetch = function (url,
|
|
208
|
+
RestDataProviderHttpProviderUsingFetch.prototype.myFetch = function (url, options) {
|
|
209
|
+
var e_4, _a;
|
|
209
210
|
var _this = this;
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
211
|
+
var headers = {
|
|
212
|
+
"Content-type": "application/json"
|
|
213
|
+
};
|
|
214
|
+
if (typeof window !== 'undefined' && typeof window.document !== 'undefined' && typeof (window.document.cookie !== 'undefined'))
|
|
215
|
+
try {
|
|
216
|
+
for (var _b = tslib_1.__values(window.document.cookie.split(';')), _c = _b.next(); !_c.done; _c = _b.next()) {
|
|
217
|
+
var cookie = _c.value;
|
|
218
|
+
if (cookie.trim().startsWith('XSRF-TOKEN=')) {
|
|
219
|
+
headers['X-XSRF-TOKEN'] = cookie.split('=')[1];
|
|
220
|
+
}
|
|
221
|
+
}
|
|
222
|
+
}
|
|
223
|
+
catch (e_4_1) { e_4 = { error: e_4_1 }; }
|
|
224
|
+
finally {
|
|
225
|
+
try {
|
|
226
|
+
if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
|
|
227
|
+
}
|
|
228
|
+
finally { if (e_4) throw e_4.error; }
|
|
229
|
+
}
|
|
230
|
+
return (this.fetch || fetch)(url, {
|
|
231
|
+
credentials: 'include',
|
|
232
|
+
method: options === null || options === void 0 ? void 0 : options.method,
|
|
233
|
+
body: options === null || options === void 0 ? void 0 : options.body,
|
|
234
|
+
headers: headers
|
|
235
|
+
}).then(function (response) {
|
|
218
236
|
return onSuccess(response);
|
|
219
237
|
}).catch(function (error) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
|
|
220
238
|
var r;
|
|
@@ -1161,7 +1161,7 @@ var rowHelperImplementation = /** @class */ (function (_super) {
|
|
|
1161
1161
|
try {
|
|
1162
1162
|
for (var _b = tslib_1.__values(info.columnsInfo), _c = _b.next(); !_c.done; _c = _b.next()) {
|
|
1163
1163
|
var col = _c.value;
|
|
1164
|
-
if (col.defaultValue) {
|
|
1164
|
+
if (col.defaultValue && instance[col.key] === undefined) {
|
|
1165
1165
|
if (typeof col.defaultValue === "function") {
|
|
1166
1166
|
instance[col.key] = col.defaultValue(instance);
|
|
1167
1167
|
}
|
|
@@ -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;
|