remult 0.14.32 → 0.14.35
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/{readme.md → README.md} +0 -0
- package/esm/remult-express.js +2 -2
- package/esm/remult-fastify.js +2 -2
- package/esm/remult-fresh.d.ts +8 -3
- package/esm/remult-fresh.js +8 -7
- package/esm/server/JsonEntityFileStorage.d.ts +4 -1
- package/esm/server/JsonEntityFileStorage.js +4 -0
- package/esm/server/expressBridge.d.ts +2 -9
- package/esm/server/expressBridge.js +4 -8
- package/esm/server/index.d.ts +2 -2
- package/esm/server/index.js +2 -2
- package/esm/src/backend-tests/test-http-server.backend-spec.js +37 -6
- package/package.json +1 -1
- package/remult-express.js +1 -1
- package/remult-fastify.js +1 -1
- package/remult-fresh.d.ts +8 -3
- package/remult-fresh.js +7 -6
- package/server/JsonEntityFileStorage.d.ts +4 -1
- package/server/JsonEntityFileStorage.js +11 -1
- package/server/expressBridge.d.ts +2 -9
- package/server/expressBridge.js +14 -13
- package/server/index.d.ts +2 -2
- package/server/index.js +4 -3
- package/src/backend-tests/test-http-server.backend-spec.js +47 -6
- package/esm/remult-middleware.d.ts +0 -10
- package/esm/remult-middleware.js +0 -117
- package/esm/server/register-actions-on-server.d.ts +0 -3
- package/esm/server/register-actions-on-server.js +0 -24
- package/esm/server/register-entities-on-server.d.ts +0 -3
- package/esm/server/register-entities-on-server.js +0 -15
- package/esm/valueConverters.d.ts +0 -12
- package/esm/valueConverters.js +0 -169
- package/postgres/postgresColumnSyntax.d.ts +0 -2
- package/postgres/postgresColumnSyntax.js +0 -34
- package/remult-middleware.d.ts +0 -10
- package/remult-middleware.js +0 -131
- package/server/register-actions-on-server.d.ts +0 -3
- package/server/register-actions-on-server.js +0 -50
- package/server/register-entities-on-server.d.ts +0 -3
- package/server/register-entities-on-server.js +0 -19
- package/valueConverters.d.ts +0 -12
- package/valueConverters.js +0 -168
package/{readme.md → README.md}
RENAMED
|
File without changes
|
package/esm/remult-express.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import * as express from 'express';
|
|
2
|
-
import {
|
|
2
|
+
import { createRemultServer } from './server/expressBridge';
|
|
3
3
|
export function remultExpress(options) {
|
|
4
4
|
let app = express.Router();
|
|
5
5
|
if (!options) {
|
|
@@ -12,7 +12,7 @@ export function remultExpress(options) {
|
|
|
12
12
|
app.use(express.json({ limit: options.bodySizeLimit }));
|
|
13
13
|
app.use(express.urlencoded({ extended: true, limit: options.bodySizeLimit }));
|
|
14
14
|
}
|
|
15
|
-
const server =
|
|
15
|
+
const server = createRemultServer(options);
|
|
16
16
|
server.registerRouter(app);
|
|
17
17
|
return Object.assign(app, {
|
|
18
18
|
getRemult: (req) => server.getRemult(req),
|
package/esm/remult-fastify.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { createRemultServer } from './server/expressBridge';
|
|
2
2
|
export function remultFastify(options) {
|
|
3
3
|
function fastifyHandler(handler) {
|
|
4
4
|
const response = (req, res) => {
|
|
@@ -18,7 +18,7 @@ export function remultFastify(options) {
|
|
|
18
18
|
};
|
|
19
19
|
return response;
|
|
20
20
|
}
|
|
21
|
-
const api =
|
|
21
|
+
const api = createRemultServer(options);
|
|
22
22
|
const pluginFunction = async (instance, op) => {
|
|
23
23
|
//@ts-ignore
|
|
24
24
|
let fastifyRouter = {
|
package/esm/remult-fresh.d.ts
CHANGED
|
@@ -1,7 +1,12 @@
|
|
|
1
|
-
import { RemultServerOptions,
|
|
1
|
+
import { RemultServerOptions, GenericRequest } from "./server/expressBridge";
|
|
2
|
+
import { Remult } from "./src/context";
|
|
2
3
|
export declare function remultFresh(options: RemultServerOptions, response: FreshResponse): RemultFresh;
|
|
3
|
-
export interface RemultFresh
|
|
4
|
-
|
|
4
|
+
export interface RemultFresh {
|
|
5
|
+
getRemult(req: GenericRequest): Promise<Remult>;
|
|
6
|
+
openApiDoc(options: {
|
|
7
|
+
title: string;
|
|
8
|
+
}): any;
|
|
9
|
+
handle(req: FreshRequest, ctx: FreshContext): Promise<any>;
|
|
5
10
|
}
|
|
6
11
|
export interface FreshRequest {
|
|
7
12
|
url: string;
|
package/esm/remult-fresh.js
CHANGED
|
@@ -1,9 +1,10 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { createRemultServer } from "./server/expressBridge";
|
|
2
2
|
export function remultFresh(options, response) {
|
|
3
|
-
const server =
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
3
|
+
const server = createRemultServer(options);
|
|
4
|
+
return {
|
|
5
|
+
getRemult: r => server.getRemult(r),
|
|
6
|
+
openApiDoc: x => server.openApiDoc(x),
|
|
7
|
+
handle: async (req, ctx) => {
|
|
7
8
|
const theReq = {
|
|
8
9
|
method: req.method,
|
|
9
10
|
url: req.url,
|
|
@@ -16,7 +17,7 @@ export function remultFresh(options, response) {
|
|
|
16
17
|
break;
|
|
17
18
|
}
|
|
18
19
|
let init = {};
|
|
19
|
-
const res = await
|
|
20
|
+
const res = await server.handle(theReq);
|
|
20
21
|
if (res) {
|
|
21
22
|
init.status = res.statusCode;
|
|
22
23
|
if (res.data) {
|
|
@@ -30,7 +31,7 @@ export function remultFresh(options, response) {
|
|
|
30
31
|
}
|
|
31
32
|
;
|
|
32
33
|
}
|
|
33
|
-
}
|
|
34
|
+
};
|
|
34
35
|
}
|
|
35
36
|
;
|
|
36
37
|
;
|
|
@@ -1,7 +1,10 @@
|
|
|
1
|
-
import { JsonEntityStorage } from '../index';
|
|
1
|
+
import { JsonDataProvider, JsonEntityStorage } from '../index';
|
|
2
2
|
export declare class JsonEntityFileStorage implements JsonEntityStorage {
|
|
3
3
|
private folderPath;
|
|
4
4
|
getItem(entityDbName: string): string;
|
|
5
5
|
setItem(entityDbName: string, json: string): void;
|
|
6
6
|
constructor(folderPath: string);
|
|
7
7
|
}
|
|
8
|
+
export declare class JsonFileDataProvider extends JsonDataProvider {
|
|
9
|
+
constructor(folderPath: string);
|
|
10
|
+
}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import * as path from 'path';
|
|
2
2
|
import * as fs from 'fs';
|
|
3
|
+
import { JsonDataProvider } from '../index';
|
|
3
4
|
export class JsonEntityFileStorage {
|
|
4
5
|
constructor(folderPath) {
|
|
5
6
|
this.folderPath = folderPath;
|
|
@@ -18,3 +19,6 @@ export class JsonEntityFileStorage {
|
|
|
18
19
|
return fs.writeFileSync(path.join(this.folderPath, entityDbName) + '.json', json);
|
|
19
20
|
}
|
|
20
21
|
}
|
|
22
|
+
export class JsonFileDataProvider extends JsonDataProvider {
|
|
23
|
+
constructor(folderPath) { super(new JsonEntityFileStorage(folderPath)); }
|
|
24
|
+
}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { queuedJobInfoResponse } from '../src/server-action';
|
|
2
2
|
import { DataProvider } from '../src/data-interfaces';
|
|
3
|
-
import { DataApiRequest } from '../src/data-api';
|
|
4
3
|
import { Remult, UserInfo } from '../src/context';
|
|
5
4
|
import { ClassType } from '../classType';
|
|
6
5
|
import { Repository } from '../src/remult3';
|
|
@@ -21,7 +20,7 @@ export declare type RemultServerOptions = {
|
|
|
21
20
|
controllers?: ClassType<any>[];
|
|
22
21
|
rootPath?: string;
|
|
23
22
|
};
|
|
24
|
-
export declare function
|
|
23
|
+
export declare function createRemultServer(options: RemultServerOptions): RemultServer;
|
|
25
24
|
export declare type GenericRequestHandler = (req: GenericRequest, res: GenericResponse, next: VoidFunction) => void;
|
|
26
25
|
export interface ServerHandleResponse {
|
|
27
26
|
data?: any;
|
|
@@ -53,15 +52,9 @@ export interface GenericRequest {
|
|
|
53
52
|
}
|
|
54
53
|
export interface GenericResponse {
|
|
55
54
|
json(data: any): any;
|
|
56
|
-
status
|
|
57
|
-
setStatus?(statusCode: number): GenericResponse;
|
|
55
|
+
status(statusCode: number): GenericResponse;
|
|
58
56
|
end(): any;
|
|
59
57
|
}
|
|
60
|
-
export declare class ExpressRequestBridgeToDataApiRequest implements DataApiRequest {
|
|
61
|
-
private r;
|
|
62
|
-
get(key: string): any;
|
|
63
|
-
constructor(r: GenericRequest);
|
|
64
|
-
}
|
|
65
58
|
export interface queuedJobInfo {
|
|
66
59
|
info: queuedJobInfoResponse;
|
|
67
60
|
userId: string;
|
|
@@ -1,12 +1,10 @@
|
|
|
1
1
|
import { __decorate, __metadata } from "tslib";
|
|
2
|
-
import { JsonEntityFileStorage } from './JsonEntityFileStorage';
|
|
3
2
|
import { Action, actionInfo, classBackendMethodsArray, serverActionField } from '../src/server-action';
|
|
4
3
|
import { DataApi, serializeError } from '../src/data-api';
|
|
5
4
|
import { allEntities, Remult } from '../src/context';
|
|
6
5
|
import { Entity, Fields, getEntityKey } from '../src/remult3';
|
|
7
|
-
import { JsonDataProvider } from '../src/data-providers/json-data-provider';
|
|
8
6
|
import { IdEntity } from '../src/id-entity';
|
|
9
|
-
export function
|
|
7
|
+
export function createRemultServer(options) {
|
|
10
8
|
if (!options) {
|
|
11
9
|
options = {};
|
|
12
10
|
}
|
|
@@ -23,10 +21,10 @@ export function buildRemultServer(options) {
|
|
|
23
21
|
}
|
|
24
22
|
else
|
|
25
23
|
dataProvider = Promise.resolve(options.dataProvider);
|
|
26
|
-
dataProvider = dataProvider.then(dp => {
|
|
24
|
+
dataProvider = dataProvider.then(async (dp) => {
|
|
27
25
|
if (dp)
|
|
28
26
|
return dp;
|
|
29
|
-
return new
|
|
27
|
+
return new (await import('./JsonEntityFileStorage')).JsonFileDataProvider('./db');
|
|
30
28
|
});
|
|
31
29
|
if (options.initApi) {
|
|
32
30
|
dataProvider = dataProvider.then(async (dp) => {
|
|
@@ -476,7 +474,7 @@ class RemultServerImplementation {
|
|
|
476
474
|
return spec;
|
|
477
475
|
}
|
|
478
476
|
}
|
|
479
|
-
|
|
477
|
+
class ExpressRequestBridgeToDataApiRequest {
|
|
480
478
|
constructor(r) {
|
|
481
479
|
this.r = r;
|
|
482
480
|
}
|
|
@@ -493,8 +491,6 @@ class ExpressResponseBridgeToDataApiResponse {
|
|
|
493
491
|
this.setStatus(403).end();
|
|
494
492
|
}
|
|
495
493
|
setStatus(status) {
|
|
496
|
-
if (this.r.setStatus)
|
|
497
|
-
return this.r.setStatus(status);
|
|
498
494
|
return this.r.status(status);
|
|
499
495
|
}
|
|
500
496
|
progress(progress) {
|
package/esm/server/index.d.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export {
|
|
2
|
-
export {
|
|
1
|
+
export { queuedJobInfo, QueueStorage, GenericRequest, GenericRequestHandler, GenericResponse, GenericRouter, createRemultServer, RemultServerOptions, SpecificRoute, RemultServer } from './expressBridge';
|
|
2
|
+
export { JsonEntityFileStorage, JsonFileDataProvider } from './JsonEntityFileStorage';
|
package/esm/server/index.js
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export {
|
|
2
|
-
export {
|
|
1
|
+
export { createRemultServer } from './expressBridge';
|
|
2
|
+
export { JsonEntityFileStorage, JsonFileDataProvider } from './JsonEntityFileStorage';
|
|
@@ -1,17 +1,22 @@
|
|
|
1
1
|
import { __decorate, __metadata } from "tslib";
|
|
2
2
|
import axios from 'axios';
|
|
3
|
+
import { remultFresh } from '../../remult-fresh';
|
|
3
4
|
import { HttpProviderBridgeToRestDataProviderHttpProvider, Remult } from '../context';
|
|
5
|
+
import { InMemoryDataProvider } from '../data-providers/in-memory-database';
|
|
4
6
|
import { Entity, Fields } from '../remult3';
|
|
5
7
|
import { Action, BackendMethod } from '../server-action';
|
|
8
|
+
import { Categories } from '../tests/remult-3-entities';
|
|
6
9
|
Remult.apiBaseUrl = 'http://localhost:3003/api';
|
|
7
10
|
let path = Remult.apiBaseUrl + '/tasks';
|
|
8
11
|
const environments = [
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
12
|
+
// ["next", 3000],
|
|
13
|
+
// ["nest", 3001],
|
|
14
|
+
// ["koa", 3002],
|
|
15
|
+
// ["fastify", 3003],
|
|
16
|
+
// ["express", 3004],
|
|
17
|
+
// ["generic server", 3005],
|
|
18
|
+
// ["optine", 3006],
|
|
19
|
+
// ["fresh", 8000]
|
|
15
20
|
];
|
|
16
21
|
function test(name, test) {
|
|
17
22
|
for (const [env, port] of environments) {
|
|
@@ -91,6 +96,32 @@ test("test regular api call", async () => {
|
|
|
91
96
|
let result = await axios.get(Remult.apiBaseUrl + "/test");
|
|
92
97
|
expect(result.data.result).toBe(3);
|
|
93
98
|
});
|
|
99
|
+
class FreshResponseTest {
|
|
100
|
+
constructor(body, init) {
|
|
101
|
+
this.body = body;
|
|
102
|
+
this.init = init;
|
|
103
|
+
}
|
|
104
|
+
static json(data, init) {
|
|
105
|
+
return new this(data, init);
|
|
106
|
+
}
|
|
107
|
+
}
|
|
108
|
+
it("test fresh", async () => {
|
|
109
|
+
const api = remultFresh({ entities: [Categories],
|
|
110
|
+
dataProvider: new InMemoryDataProvider(),
|
|
111
|
+
rootPath: '/api' }, FreshResponseTest);
|
|
112
|
+
const r = await api.handle({
|
|
113
|
+
url: '/api/Categories',
|
|
114
|
+
json() {
|
|
115
|
+
return undefined;
|
|
116
|
+
},
|
|
117
|
+
method: "get"
|
|
118
|
+
}, {
|
|
119
|
+
next() {
|
|
120
|
+
return undefined;
|
|
121
|
+
},
|
|
122
|
+
});
|
|
123
|
+
expect(r.body).toEqual([]);
|
|
124
|
+
});
|
|
94
125
|
let Task = class Task {
|
|
95
126
|
constructor() {
|
|
96
127
|
this.title = '';
|
package/package.json
CHANGED
package/remult-express.js
CHANGED
|
@@ -15,7 +15,7 @@ function remultExpress(options) {
|
|
|
15
15
|
app.use(express.json({ limit: options.bodySizeLimit }));
|
|
16
16
|
app.use(express.urlencoded({ extended: true, limit: options.bodySizeLimit }));
|
|
17
17
|
}
|
|
18
|
-
var server = expressBridge_1.
|
|
18
|
+
var server = expressBridge_1.createRemultServer(options);
|
|
19
19
|
server.registerRouter(app);
|
|
20
20
|
return Object.assign(app, {
|
|
21
21
|
getRemult: function (req) { return server.getRemult(req); },
|
package/remult-fastify.js
CHANGED
|
@@ -23,7 +23,7 @@ function remultFastify(options) {
|
|
|
23
23
|
};
|
|
24
24
|
return response;
|
|
25
25
|
}
|
|
26
|
-
var api = expressBridge_1.
|
|
26
|
+
var api = expressBridge_1.createRemultServer(options);
|
|
27
27
|
var pluginFunction = function (instance, op) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
|
|
28
28
|
var fastifyRouter;
|
|
29
29
|
return tslib_1.__generator(this, function (_a) {
|
package/remult-fresh.d.ts
CHANGED
|
@@ -1,7 +1,12 @@
|
|
|
1
|
-
import { RemultServerOptions,
|
|
1
|
+
import { RemultServerOptions, GenericRequest } from "./server/expressBridge";
|
|
2
|
+
import { Remult } from "./src/context";
|
|
2
3
|
export declare function remultFresh(options: RemultServerOptions, response: FreshResponse): RemultFresh;
|
|
3
|
-
export interface RemultFresh
|
|
4
|
-
|
|
4
|
+
export interface RemultFresh {
|
|
5
|
+
getRemult(req: GenericRequest): Promise<Remult>;
|
|
6
|
+
openApiDoc(options: {
|
|
7
|
+
title: string;
|
|
8
|
+
}): any;
|
|
9
|
+
handle(req: FreshRequest, ctx: FreshContext): Promise<any>;
|
|
5
10
|
}
|
|
6
11
|
export interface FreshRequest {
|
|
7
12
|
url: string;
|
package/remult-fresh.js
CHANGED
|
@@ -5,10 +5,11 @@ var tslib_1 = require("tslib");
|
|
|
5
5
|
var expressBridge_1 = require("./server/expressBridge");
|
|
6
6
|
function remultFresh(options, response) {
|
|
7
7
|
var _this = this;
|
|
8
|
-
var server = expressBridge_1.
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
8
|
+
var server = expressBridge_1.createRemultServer(options);
|
|
9
|
+
return {
|
|
10
|
+
getRemult: function (r) { return server.getRemult(r); },
|
|
11
|
+
openApiDoc: function (x) { return server.openApiDoc(x); },
|
|
12
|
+
handle: function (req, ctx) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
|
|
12
13
|
var theReq, _a, _b, init, res;
|
|
13
14
|
return tslib_1.__generator(this, function (_c) {
|
|
14
15
|
switch (_c.label) {
|
|
@@ -32,7 +33,7 @@ function remultFresh(options, response) {
|
|
|
32
33
|
return [3 /*break*/, 3];
|
|
33
34
|
case 3:
|
|
34
35
|
init = {};
|
|
35
|
-
return [4 /*yield*/,
|
|
36
|
+
return [4 /*yield*/, server.handle(theReq)];
|
|
36
37
|
case 4:
|
|
37
38
|
res = _c.sent();
|
|
38
39
|
if (res) {
|
|
@@ -51,7 +52,7 @@ function remultFresh(options, response) {
|
|
|
51
52
|
}
|
|
52
53
|
});
|
|
53
54
|
}); }
|
|
54
|
-
}
|
|
55
|
+
};
|
|
55
56
|
}
|
|
56
57
|
exports.remultFresh = remultFresh;
|
|
57
58
|
;
|
|
@@ -1,7 +1,10 @@
|
|
|
1
|
-
import { JsonEntityStorage } from '../index';
|
|
1
|
+
import { JsonDataProvider, JsonEntityStorage } from '../index';
|
|
2
2
|
export declare class JsonEntityFileStorage implements JsonEntityStorage {
|
|
3
3
|
private folderPath;
|
|
4
4
|
getItem(entityDbName: string): string;
|
|
5
5
|
setItem(entityDbName: string, json: string): void;
|
|
6
6
|
constructor(folderPath: string);
|
|
7
7
|
}
|
|
8
|
+
export declare class JsonFileDataProvider extends JsonDataProvider {
|
|
9
|
+
constructor(folderPath: string);
|
|
10
|
+
}
|
|
@@ -1,8 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.JsonEntityFileStorage = void 0;
|
|
3
|
+
exports.JsonFileDataProvider = exports.JsonEntityFileStorage = void 0;
|
|
4
|
+
var tslib_1 = require("tslib");
|
|
4
5
|
var path = require("path");
|
|
5
6
|
var fs = require("fs");
|
|
7
|
+
var index_1 = require("../index");
|
|
6
8
|
var JsonEntityFileStorage = /** @class */ (function () {
|
|
7
9
|
function JsonEntityFileStorage(folderPath) {
|
|
8
10
|
this.folderPath = folderPath;
|
|
@@ -23,3 +25,11 @@ var JsonEntityFileStorage = /** @class */ (function () {
|
|
|
23
25
|
return JsonEntityFileStorage;
|
|
24
26
|
}());
|
|
25
27
|
exports.JsonEntityFileStorage = JsonEntityFileStorage;
|
|
28
|
+
var JsonFileDataProvider = /** @class */ (function (_super) {
|
|
29
|
+
tslib_1.__extends(JsonFileDataProvider, _super);
|
|
30
|
+
function JsonFileDataProvider(folderPath) {
|
|
31
|
+
return _super.call(this, new JsonEntityFileStorage(folderPath)) || this;
|
|
32
|
+
}
|
|
33
|
+
return JsonFileDataProvider;
|
|
34
|
+
}(index_1.JsonDataProvider));
|
|
35
|
+
exports.JsonFileDataProvider = JsonFileDataProvider;
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { queuedJobInfoResponse } from '../src/server-action';
|
|
2
2
|
import { DataProvider } from '../src/data-interfaces';
|
|
3
|
-
import { DataApiRequest } from '../src/data-api';
|
|
4
3
|
import { Remult, UserInfo } from '../src/context';
|
|
5
4
|
import { ClassType } from '../classType';
|
|
6
5
|
import { Repository } from '../src/remult3';
|
|
@@ -21,7 +20,7 @@ export declare type RemultServerOptions = {
|
|
|
21
20
|
controllers?: ClassType<any>[];
|
|
22
21
|
rootPath?: string;
|
|
23
22
|
};
|
|
24
|
-
export declare function
|
|
23
|
+
export declare function createRemultServer(options: RemultServerOptions): RemultServer;
|
|
25
24
|
export declare type GenericRequestHandler = (req: GenericRequest, res: GenericResponse, next: VoidFunction) => void;
|
|
26
25
|
export interface ServerHandleResponse {
|
|
27
26
|
data?: any;
|
|
@@ -53,15 +52,9 @@ export interface GenericRequest {
|
|
|
53
52
|
}
|
|
54
53
|
export interface GenericResponse {
|
|
55
54
|
json(data: any): any;
|
|
56
|
-
status
|
|
57
|
-
setStatus?(statusCode: number): GenericResponse;
|
|
55
|
+
status(statusCode: number): GenericResponse;
|
|
58
56
|
end(): any;
|
|
59
57
|
}
|
|
60
|
-
export declare class ExpressRequestBridgeToDataApiRequest implements DataApiRequest {
|
|
61
|
-
private r;
|
|
62
|
-
get(key: string): any;
|
|
63
|
-
constructor(r: GenericRequest);
|
|
64
|
-
}
|
|
65
58
|
export interface queuedJobInfo {
|
|
66
59
|
info: queuedJobInfoResponse;
|
|
67
60
|
userId: string;
|
package/server/expressBridge.js
CHANGED
|
@@ -1,15 +1,13 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.JobsInQueueEntity = exports.EntityQueueStorage = exports.
|
|
3
|
+
exports.JobsInQueueEntity = exports.EntityQueueStorage = exports.createRemultServer = void 0;
|
|
4
4
|
var tslib_1 = require("tslib");
|
|
5
|
-
var JsonEntityFileStorage_1 = require("./JsonEntityFileStorage");
|
|
6
5
|
var server_action_1 = require("../src/server-action");
|
|
7
6
|
var data_api_1 = require("../src/data-api");
|
|
8
7
|
var context_1 = require("../src/context");
|
|
9
8
|
var remult3_1 = require("../src/remult3");
|
|
10
|
-
var json_data_provider_1 = require("../src/data-providers/json-data-provider");
|
|
11
9
|
var id_entity_1 = require("../src/id-entity");
|
|
12
|
-
function
|
|
10
|
+
function createRemultServer(options) {
|
|
13
11
|
var _this = this;
|
|
14
12
|
if (!options) {
|
|
15
13
|
options = {};
|
|
@@ -27,11 +25,17 @@ function buildRemultServer(options) {
|
|
|
27
25
|
}
|
|
28
26
|
else
|
|
29
27
|
dataProvider = Promise.resolve(options.dataProvider);
|
|
30
|
-
dataProvider = dataProvider.then(function (dp) {
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
28
|
+
dataProvider = dataProvider.then(function (dp) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
|
|
29
|
+
return tslib_1.__generator(this, function (_a) {
|
|
30
|
+
switch (_a.label) {
|
|
31
|
+
case 0:
|
|
32
|
+
if (dp)
|
|
33
|
+
return [2 /*return*/, dp];
|
|
34
|
+
return [4 /*yield*/, Promise.resolve().then(function () { return require('./JsonEntityFileStorage'); })];
|
|
35
|
+
case 1: return [2 /*return*/, new (_a.sent()).JsonFileDataProvider('./db')];
|
|
36
|
+
}
|
|
37
|
+
});
|
|
38
|
+
}); });
|
|
35
39
|
if (options.initApi) {
|
|
36
40
|
dataProvider = dataProvider.then(function (dp) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
|
|
37
41
|
var remult;
|
|
@@ -63,7 +67,7 @@ function buildRemultServer(options) {
|
|
|
63
67
|
var bridge = new RemultServerImplementation(new inProcessQueueHandler(options.queueStorage), options, dataProvider);
|
|
64
68
|
return bridge;
|
|
65
69
|
}
|
|
66
|
-
exports.
|
|
70
|
+
exports.createRemultServer = createRemultServer;
|
|
67
71
|
;
|
|
68
72
|
var RemultServerImplementation = /** @class */ (function () {
|
|
69
73
|
function RemultServerImplementation(queue, options, dataProvider) {
|
|
@@ -601,7 +605,6 @@ var ExpressRequestBridgeToDataApiRequest = /** @class */ (function () {
|
|
|
601
605
|
};
|
|
602
606
|
return ExpressRequestBridgeToDataApiRequest;
|
|
603
607
|
}());
|
|
604
|
-
exports.ExpressRequestBridgeToDataApiRequest = ExpressRequestBridgeToDataApiRequest;
|
|
605
608
|
var ExpressResponseBridgeToDataApiResponse = /** @class */ (function () {
|
|
606
609
|
function ExpressResponseBridgeToDataApiResponse(r, req) {
|
|
607
610
|
this.r = r;
|
|
@@ -611,8 +614,6 @@ var ExpressResponseBridgeToDataApiResponse = /** @class */ (function () {
|
|
|
611
614
|
this.setStatus(403).end();
|
|
612
615
|
};
|
|
613
616
|
ExpressResponseBridgeToDataApiResponse.prototype.setStatus = function (status) {
|
|
614
|
-
if (this.r.setStatus)
|
|
615
|
-
return this.r.setStatus(status);
|
|
616
617
|
return this.r.status(status);
|
|
617
618
|
};
|
|
618
619
|
ExpressResponseBridgeToDataApiResponse.prototype.progress = function (progress) {
|
package/server/index.d.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export {
|
|
2
|
-
export {
|
|
1
|
+
export { queuedJobInfo, QueueStorage, GenericRequest, GenericRequestHandler, GenericResponse, GenericRouter, createRemultServer, RemultServerOptions, SpecificRoute, RemultServer } from './expressBridge';
|
|
2
|
+
export { JsonEntityFileStorage, JsonFileDataProvider } from './JsonEntityFileStorage';
|
package/server/index.js
CHANGED
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.JsonFileDataProvider = exports.JsonEntityFileStorage = exports.createRemultServer = void 0;
|
|
4
|
+
var expressBridge_1 = require("./expressBridge");
|
|
5
|
+
Object.defineProperty(exports, "createRemultServer", { enumerable: true, get: function () { return expressBridge_1.createRemultServer; } });
|
|
4
6
|
var JsonEntityFileStorage_1 = require("./JsonEntityFileStorage");
|
|
5
7
|
Object.defineProperty(exports, "JsonEntityFileStorage", { enumerable: true, get: function () { return JsonEntityFileStorage_1.JsonEntityFileStorage; } });
|
|
6
|
-
|
|
7
|
-
Object.defineProperty(exports, "buildRemultServer", { enumerable: true, get: function () { return expressBridge_1.buildRemultServer; } });
|
|
8
|
+
Object.defineProperty(exports, "JsonFileDataProvider", { enumerable: true, get: function () { return JsonEntityFileStorage_1.JsonFileDataProvider; } });
|
|
@@ -3,18 +3,23 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.Task = void 0;
|
|
4
4
|
var tslib_1 = require("tslib");
|
|
5
5
|
var axios_1 = require("axios");
|
|
6
|
+
var remult_fresh_1 = require("../../remult-fresh");
|
|
6
7
|
var context_1 = require("../context");
|
|
8
|
+
var in_memory_database_1 = require("../data-providers/in-memory-database");
|
|
7
9
|
var remult3_1 = require("../remult3");
|
|
8
10
|
var server_action_1 = require("../server-action");
|
|
11
|
+
var remult_3_entities_1 = require("../tests/remult-3-entities");
|
|
9
12
|
context_1.Remult.apiBaseUrl = 'http://localhost:3003/api';
|
|
10
13
|
var path = context_1.Remult.apiBaseUrl + '/tasks';
|
|
11
14
|
var environments = [
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
15
|
+
// ["next", 3000],
|
|
16
|
+
// ["nest", 3001],
|
|
17
|
+
// ["koa", 3002],
|
|
18
|
+
// ["fastify", 3003],
|
|
19
|
+
// ["express", 3004],
|
|
20
|
+
// ["generic server", 3005],
|
|
21
|
+
// ["optine", 3006],
|
|
22
|
+
// ["fresh", 8000]
|
|
18
23
|
];
|
|
19
24
|
function test(name, test) {
|
|
20
25
|
var e_1, _a;
|
|
@@ -208,6 +213,42 @@ test("test regular api call", function () { return tslib_1.__awaiter(void 0, voi
|
|
|
208
213
|
}
|
|
209
214
|
});
|
|
210
215
|
}); });
|
|
216
|
+
var FreshResponseTest = /** @class */ (function () {
|
|
217
|
+
function FreshResponseTest(body, init) {
|
|
218
|
+
this.body = body;
|
|
219
|
+
this.init = init;
|
|
220
|
+
}
|
|
221
|
+
FreshResponseTest.json = function (data, init) {
|
|
222
|
+
return new this(data, init);
|
|
223
|
+
};
|
|
224
|
+
return FreshResponseTest;
|
|
225
|
+
}());
|
|
226
|
+
it("test fresh", function () { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
|
|
227
|
+
var api, r;
|
|
228
|
+
return tslib_1.__generator(this, function (_a) {
|
|
229
|
+
switch (_a.label) {
|
|
230
|
+
case 0:
|
|
231
|
+
api = remult_fresh_1.remultFresh({ entities: [remult_3_entities_1.Categories],
|
|
232
|
+
dataProvider: new in_memory_database_1.InMemoryDataProvider(),
|
|
233
|
+
rootPath: '/api' }, FreshResponseTest);
|
|
234
|
+
return [4 /*yield*/, api.handle({
|
|
235
|
+
url: '/api/Categories',
|
|
236
|
+
json: function () {
|
|
237
|
+
return undefined;
|
|
238
|
+
},
|
|
239
|
+
method: "get"
|
|
240
|
+
}, {
|
|
241
|
+
next: function () {
|
|
242
|
+
return undefined;
|
|
243
|
+
},
|
|
244
|
+
})];
|
|
245
|
+
case 1:
|
|
246
|
+
r = _a.sent();
|
|
247
|
+
expect(r.body).toEqual([]);
|
|
248
|
+
return [2 /*return*/];
|
|
249
|
+
}
|
|
250
|
+
});
|
|
251
|
+
}); });
|
|
211
252
|
var Task = /** @class */ (function () {
|
|
212
253
|
function Task() {
|
|
213
254
|
this.title = '';
|
|
@@ -1,10 +0,0 @@
|
|
|
1
|
-
import { GenericRequest, GenericMiddleware, GenericResponse, GenericRouter, buildRemultServer, RemultServerOptions, SpecificRoute, RemultServer } from './server/expressBridge';
|
|
2
|
-
export declare function remultMiddleware(options?: RemultServerOptions): RemultMiddleware;
|
|
3
|
-
export interface RemultMiddleware extends GenericMiddleware, RemultServer {
|
|
4
|
-
handle(req: GenericRequest, gRes?: GenericResponse): Promise<MiddlewareResponse>;
|
|
5
|
-
}
|
|
6
|
-
export interface MiddlewareResponse {
|
|
7
|
-
data?: any;
|
|
8
|
-
statusCode?: number;
|
|
9
|
-
}
|
|
10
|
-
export { GenericRequest, GenericMiddleware as GenericRequestHandler, GenericResponse, GenericRouter, buildRemultServer, RemultServerOptions as RemultMiddlewareOptions, SpecificRoute, RemultServer };
|