remult 0.16.0-exp.2 → 0.16.0-exp.5

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.
Files changed (5) hide show
  1. package/esm/index.d.ts +1 -1
  2. package/esm/server/expressBridge.js +19 -16
  3. package/index.d.ts +1 -1
  4. package/package.json +1 -1
  5. package/server/expressBridge.js +39 -33
package/esm/index.d.ts CHANGED
@@ -12,7 +12,7 @@ export { SqlDatabase, } from './src/data-providers/sql-database';
12
12
  export { CustomSqlFilterObject, CustomSqlFilterBuilder } from './src/filter/filter-consumer-bridge-to-sql-request';
13
13
  export { JsonDataProvider, JsonEntityStorage } from './src/data-providers/json-data-provider';
14
14
  export { Controller, BackendMethodOptions, BackendMethod, ProgressListener } from './src/server-action';
15
- export { Allowed, Allow, Remult, isBackend, AllowedForInstance, EventDispatcher, EventSource, HttpProvider, Unobserve, UserInfo } from './src/context';
15
+ export { Allowed, Allow, Remult, RemultState, isBackend, AllowedForInstance, EventDispatcher, EventSource, HttpProvider, Unobserve, UserInfo } from './src/context';
16
16
  export { IdEntity } from './src/id-entity';
17
17
  export { SortSegment, Sort } from './src/sort';
18
18
  export { OneToMany, CompoundIdField } from './src/column';
package/esm/server/expressBridge.js CHANGED
@@ -153,23 +153,26 @@ class RemultServerImplementation {
153
153
  let myRes = new ExpressResponseBridgeToDataApiResponse(res, req);
154
154
  let remult = new Remult();
155
155
  remult.setDataProvider(await this.dataProvider);
156
- remultObjectStorage.run(remult, async () => {
157
- if (req) {
158
- let user;
159
- if (this.options.getUser)
160
- user = await this.options.getUser(req);
161
- else {
162
- user = req['user'];
163
- if (!user)
164
- user = req['auth'];
156
+ await new Promise(res => {
157
+ remultObjectStorage.run(remult, async () => {
158
+ if (req) {
159
+ let user;
160
+ if (this.options.getUser)
161
+ user = await this.options.getUser(req);
162
+ else {
163
+ user = req['user'];
164
+ if (!user)
165
+ user = req['auth'];
166
+ }
167
+ if (user)
168
+ remult.setUser(user);
165
169
  }
166
- if (user)
167
- remult.setUser(user);
168
- }
169
- if (this.options.initRequest) {
170
- await this.options.initRequest(remult, req);
171
- }
172
- what(remult, myReq, myRes, req);
170
+ if (this.options.initRequest) {
171
+ await this.options.initRequest(remult, req);
172
+ }
173
+ await what(remult, myReq, myRes, req);
174
+ res({});
175
+ });
173
176
  });
174
177
  };
175
178
  }
package/index.d.ts CHANGED
@@ -12,7 +12,7 @@ export { SqlDatabase, } from './src/data-providers/sql-database';
12
12
  export { CustomSqlFilterObject, CustomSqlFilterBuilder } from './src/filter/filter-consumer-bridge-to-sql-request';
13
13
  export { JsonDataProvider, JsonEntityStorage } from './src/data-providers/json-data-provider';
14
14
  export { Controller, BackendMethodOptions, BackendMethod, ProgressListener } from './src/server-action';
15
- export { Allowed, Allow, Remult, isBackend, AllowedForInstance, EventDispatcher, EventSource, HttpProvider, Unobserve, UserInfo } from './src/context';
15
+ export { Allowed, Allow, Remult, RemultState, isBackend, AllowedForInstance, EventDispatcher, EventSource, HttpProvider, Unobserve, UserInfo } from './src/context';
16
16
  export { IdEntity } from './src/id-entity';
17
17
  export { SortSegment, Sort } from './src/sort';
18
18
  export { OneToMany, CompoundIdField } from './src/column';
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "remult",
3
- "version": "0.16.0-exp.2",
3
+ "version": "0.16.0-exp.5",
4
4
  "description": "A CRUD framework for full-stack TypeScript",
5
5
  "main": "index.js",
6
6
  "types": "index.d.ts",
package/server/expressBridge.js CHANGED
@@ -234,39 +234,45 @@ var RemultServerImplementation = /** @class */ (function () {
234
234
  return [4 /*yield*/, this.dataProvider];
235
235
  case 1:
236
236
  _b.apply(_a, [_c.sent()]);
237
- remultObjectStorage.run(remult, function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
238
- var user;
239
- return tslib_1.__generator(this, function (_a) {
240
- switch (_a.label) {
241
- case 0:
242
- if (!req) return [3 /*break*/, 4];
243
- user = void 0;
244
- if (!this.options.getUser) return [3 /*break*/, 2];
245
- return [4 /*yield*/, this.options.getUser(req)];
246
- case 1:
247
- user = _a.sent();
248
- return [3 /*break*/, 3];
249
- case 2:
250
- user = req['user'];
251
- if (!user)
252
- user = req['auth'];
253
- _a.label = 3;
254
- case 3:
255
- if (user)
256
- remult.setUser(user);
257
- _a.label = 4;
258
- case 4:
259
- if (!this.options.initRequest) return [3 /*break*/, 6];
260
- return [4 /*yield*/, this.options.initRequest(remult, req)];
261
- case 5:
262
- _a.sent();
263
- _a.label = 6;
264
- case 6:
265
- what(remult, myReq, myRes, req);
266
- return [2 /*return*/];
267
- }
268
- });
269
- }); });
237
+ return [4 /*yield*/, new Promise(function (res) {
238
+ remultObjectStorage.run(remult, function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
239
+ var user;
240
+ return tslib_1.__generator(this, function (_a) {
241
+ switch (_a.label) {
242
+ case 0:
243
+ if (!req) return [3 /*break*/, 4];
244
+ user = void 0;
245
+ if (!this.options.getUser) return [3 /*break*/, 2];
246
+ return [4 /*yield*/, this.options.getUser(req)];
247
+ case 1:
248
+ user = _a.sent();
249
+ return [3 /*break*/, 3];
250
+ case 2:
251
+ user = req['user'];
252
+ if (!user)
253
+ user = req['auth'];
254
+ _a.label = 3;
255
+ case 3:
256
+ if (user)
257
+ remult.setUser(user);
258
+ _a.label = 4;
259
+ case 4:
260
+ if (!this.options.initRequest) return [3 /*break*/, 6];
261
+ return [4 /*yield*/, this.options.initRequest(remult, req)];
262
+ case 5:
263
+ _a.sent();
264
+ _a.label = 6;
265
+ case 6: return [4 /*yield*/, what(remult, myReq, myRes, req)];
266
+ case 7:
267
+ _a.sent();
268
+ res({});
269
+ return [2 /*return*/];
270
+ }
271
+ });
272
+ }); });
273
+ })];
274
+ case 2:
275
+ _c.sent();
270
276
  return [2 /*return*/];
271
277
  }
272
278
  });