@spinajs/orm-http 1.2.127 → 1.2.137

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.
@@ -8,6 +8,7 @@ module.exports = {
8
8
  system: {
9
9
  dirs: {
10
10
  controllers: [dir('./../controllers')],
11
+ schemas: [dir('./../schemas')],
11
12
  },
12
13
  },
13
14
  };
@@ -1 +1 @@
1
- {"version":3,"file":"orm-http.js","sourceRoot":"","sources":["../../src/config/orm-http.ts"],"names":[],"mappings":";;AAAA,+BAAgD;AAEhD,SAAS,GAAG,CAAC,IAAY;IACvB,OAAO,IAAA,cAAO,EAAC,IAAA,gBAAS,EAAC,IAAA,WAAI,EAAC,SAAS,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;AACnD,CAAC;AAED,MAAM,CAAC,OAAO,GAAG;IACf,MAAM,EAAE;QACN,IAAI,EAAE;YACJ,WAAW,EAAE,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;SACvC;KACF;CACF,CAAC"}
1
+ {"version":3,"file":"orm-http.js","sourceRoot":"","sources":["../../src/config/orm-http.ts"],"names":[],"mappings":";;AAAA,+BAAgD;AAEhD,SAAS,GAAG,CAAC,IAAY;IACvB,OAAO,IAAA,cAAO,EAAC,IAAA,gBAAS,EAAC,IAAA,WAAI,EAAC,SAAS,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;AACnD,CAAC;AAED,MAAM,CAAC,OAAO,GAAG;IACf,MAAM,EAAE;QACN,IAAI,EAAE;YACJ,WAAW,EAAE,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;YACtC,OAAO,EAAE,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;SAC/B;KACF;CACF,CAAC"}
@@ -0,0 +1,36 @@
1
+ import { AccessControl } from '@spinajs/rbac';
2
+ import { Constructor } from '@spinajs/di';
3
+ import { BaseController, Ok } from '@spinajs/http';
4
+ import { ModelBase, SelectQueryBuilder, Orm, DeleteQueryBuilder, UpdateQueryBuilder, InsertQueryBuilder, IModelDescriptor } from '@spinajs/orm';
5
+ import * as express from 'express';
6
+ import { RepositoryMiddleware } from '../middleware';
7
+ import { JsonApiIncomingObject } from '../interfaces';
8
+ declare class Includes {
9
+ Param: string[][];
10
+ constructor(Param: string[][]);
11
+ }
12
+ declare class Filters {
13
+ Param: any;
14
+ constructor(Param: any);
15
+ }
16
+ declare class Model {
17
+ Type: Constructor<ModelBase>;
18
+ Descriptor: IModelDescriptor;
19
+ get SelectQuery(): SelectQueryBuilder<ModelBase>;
20
+ get InserQuery(): InsertQueryBuilder;
21
+ get DeleteQuery(): DeleteQueryBuilder<unknown>;
22
+ get UpdateQueryBuilder(): UpdateQueryBuilder<unknown>;
23
+ }
24
+ export declare class JsonApi extends BaseController {
25
+ protected Orm: Orm;
26
+ protected Ac: AccessControl;
27
+ protected Middlewares: RepositoryMiddleware[];
28
+ constructor(Orm: Orm, Ac: AccessControl);
29
+ resolveAsync(): Promise<void>;
30
+ get(model: Model, id: string | number, include: Includes, _filters: Filters, req: express.Request): Promise<Ok>;
31
+ getAll(model: Model, page: number, perPage: number, order: string, orderDirection: 'ASC' | 'DESC', include: Includes, _filters: Filters, req: express.Request): Promise<Ok>;
32
+ del(model: Model, id: string | number, req: express.Request): Promise<Ok>;
33
+ patch(model: Model, id: string | number, incoming: JsonApiIncomingObject, req: express.Request): Promise<Ok>;
34
+ insert(model: Model, incoming: JsonApiIncomingObject, req: express.Request): Promise<Ok>;
35
+ }
36
+ export {};
@@ -0,0 +1,330 @@
1
+ "use strict";
2
+ var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
+ if (k2 === undefined) k2 = k;
4
+ var desc = Object.getOwnPropertyDescriptor(m, k);
5
+ if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
+ desc = { enumerable: true, get: function() { return m[k]; } };
7
+ }
8
+ Object.defineProperty(o, k2, desc);
9
+ }) : (function(o, m, k, k2) {
10
+ if (k2 === undefined) k2 = k;
11
+ o[k2] = m[k];
12
+ }));
13
+ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
14
+ Object.defineProperty(o, "default", { enumerable: true, value: v });
15
+ }) : function(o, v) {
16
+ o["default"] = v;
17
+ });
18
+ var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
19
+ var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
20
+ if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
21
+ else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
22
+ return c > 3 && r && Object.defineProperty(target, key, r), r;
23
+ };
24
+ var __importStar = (this && this.__importStar) || function (mod) {
25
+ if (mod && mod.__esModule) return mod;
26
+ var result = {};
27
+ if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
28
+ __setModuleDefault(result, mod);
29
+ return result;
30
+ };
31
+ var __metadata = (this && this.__metadata) || function (k, v) {
32
+ if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
33
+ };
34
+ var __param = (this && this.__param) || function (paramIndex, decorator) {
35
+ return function (target, key) { decorator(target, key, paramIndex); }
36
+ };
37
+ var __importDefault = (this && this.__importDefault) || function (mod) {
38
+ return (mod && mod.__esModule) ? mod : { "default": mod };
39
+ };
40
+ Object.defineProperty(exports, "__esModule", { value: true });
41
+ exports.JsonApi = void 0;
42
+ const rbac_1 = require("@spinajs/rbac");
43
+ const di_1 = require("@spinajs/di");
44
+ const http_1 = require("@spinajs/http");
45
+ const http_2 = require("@spinajs/http");
46
+ const orm_1 = require("@spinajs/orm");
47
+ const lodash_1 = __importDefault(require("lodash"));
48
+ const express = __importStar(require("express"));
49
+ const middleware_1 = require("../middleware");
50
+ const interfaces_1 = require("../interfaces");
51
+ class IncludesHydrator extends http_1.ArgHydrator {
52
+ async hydrate(input) {
53
+ return new Includes(input ? input.split(',').map((x) => x.split('.')) : []);
54
+ }
55
+ }
56
+ class FiltersHydrator extends http_1.ArgHydrator {
57
+ async hydrate(input) {
58
+ return new Filters(input ? JSON.parse(input) : []);
59
+ }
60
+ }
61
+ class ModelParamHydrator extends http_1.ArgHydrator {
62
+ async hydrate(input) {
63
+ const model = this.Orm.Models.find((x) => x.name.toLowerCase() === input.toLowerCase()).type;
64
+ const desc = (0, orm_1.extractModelDescriptor)(model);
65
+ const param = new Model();
66
+ param.Descriptor = desc;
67
+ param.Type = model;
68
+ return param;
69
+ }
70
+ }
71
+ __decorate([
72
+ (0, di_1.Autoinject)(orm_1.Orm),
73
+ __metadata("design:type", orm_1.Orm)
74
+ ], ModelParamHydrator.prototype, "Orm", void 0);
75
+ function dehydrate(model, omit) {
76
+ const dObj = {
77
+ type: model.constructor.name,
78
+ id: model.PrimaryKeyValue,
79
+ attributes: model.dehydrate(false, omit),
80
+ relationships: lodash_1.default.mapValues(lodash_1.default.groupBy(model.getFlattenRelationModels(false), '__relationKey__'), (x) => {
81
+ return x.map((xx) => {
82
+ return {
83
+ type: xx.constructor.name,
84
+ id: xx.PrimaryKeyValue,
85
+ };
86
+ });
87
+ }),
88
+ };
89
+ return dObj;
90
+ }
91
+ function modelToJsonApi(model) {
92
+ return {
93
+ data: Array.isArray(model) ? model.map((m) => dehydrate(m)) : dehydrate(model),
94
+ included: Array.isArray(model) ? lodash_1.default.flatMap(model, extractIncluded) : extractIncluded(model),
95
+ };
96
+ }
97
+ function extractIncluded(model) {
98
+ return model.getFlattenRelationModels(true).map((m) => dehydrate(m));
99
+ }
100
+ function applyQueryIncludes(includes, query) {
101
+ let currQuery = null;
102
+ includes.Param.forEach((i) => {
103
+ currQuery = query;
104
+ i.forEach((ii) => {
105
+ currQuery.populate(ii, function () {
106
+ currQuery = this;
107
+ });
108
+ });
109
+ });
110
+ }
111
+ let Includes = class Includes {
112
+ constructor(Param) {
113
+ this.Param = Param;
114
+ }
115
+ };
116
+ Includes = __decorate([
117
+ (0, http_1.Hydrator)(IncludesHydrator),
118
+ __metadata("design:paramtypes", [Array])
119
+ ], Includes);
120
+ let Filters = class Filters {
121
+ constructor(Param) {
122
+ this.Param = Param;
123
+ }
124
+ };
125
+ Filters = __decorate([
126
+ (0, http_1.Hydrator)(FiltersHydrator),
127
+ __metadata("design:paramtypes", [Object])
128
+ ], Filters);
129
+ let Model = class Model {
130
+ get SelectQuery() {
131
+ return (0, orm_1.createQuery)(this.Type, orm_1.SelectQueryBuilder).query;
132
+ }
133
+ get InserQuery() {
134
+ return (0, orm_1.createQuery)(this.Type, orm_1.InsertQueryBuilder).query;
135
+ }
136
+ get DeleteQuery() {
137
+ return (0, orm_1.createQuery)(this.Type, orm_1.DeleteQueryBuilder).query;
138
+ }
139
+ get UpdateQueryBuilder() {
140
+ return (0, orm_1.createQuery)(this.Type, orm_1.UpdateQueryBuilder).query;
141
+ }
142
+ };
143
+ Model = __decorate([
144
+ (0, http_1.Hydrator)(ModelParamHydrator)
145
+ ], Model);
146
+ const PrimaryKeySchema = {
147
+ $id: 'JsonApiPrimaryKeySchema',
148
+ title: 'Json api primary key schema for id parameter',
149
+ anyOf: [
150
+ { type: 'string', minLength: 0, maxLength: 16 },
151
+ { type: 'number', minimum: 0 },
152
+ { type: 'string', pattern: '^[0-9a-f]{8}-?[0-9a-f]{4}-?[0-9a-f]{4}-?[0-9a-f]{4}-?[0-9a-f]{12}$', minLength: 32, maxLength: 36 },
153
+ ],
154
+ };
155
+ const modelSchema = {
156
+ $id: 'JsonApiModelSchema',
157
+ title: 'Json api modele/resource schema',
158
+ type: 'string',
159
+ minLength: 0,
160
+ maxLength: 32,
161
+ };
162
+ const genericStringSchema = {
163
+ $id: 'JsonApiIncludeSchema',
164
+ title: 'Json api modele/resource schema',
165
+ type: 'string',
166
+ minLength: 0,
167
+ maxLength: 256,
168
+ };
169
+ let JsonApi = class JsonApi extends http_1.BaseController {
170
+ constructor(Orm, Ac) {
171
+ super();
172
+ this.Orm = Orm;
173
+ this.Ac = Ac;
174
+ }
175
+ async resolveAsync() {
176
+ super.resolveAsync();
177
+ this.Middlewares = await di_1.DI.resolve(Array.ofType(middleware_1.RepositoryMiddleware));
178
+ }
179
+ async get(model, id, include, _filters, req) {
180
+ await Promise.all(this.Middlewares.map((m) => m.onGetMiddlewareStart(id, req)));
181
+ const query = model.SelectQuery.select('*').where(model.Descriptor.PrimaryKey, id);
182
+ applyQueryIncludes(include, query);
183
+ this.Middlewares.forEach((m) => m.onGetMiddlewareQuery(query, model.Type, req));
184
+ const result = await query.firstOrFail();
185
+ let jResult = modelToJsonApi(result);
186
+ this.Middlewares.forEach((m) => {
187
+ jResult = m.onGetMiddlewareResult(jResult, req);
188
+ });
189
+ return new http_1.Ok(jResult);
190
+ }
191
+ async getAll(model, page, perPage, order, orderDirection, include, _filters, req) {
192
+ await Promise.all(this.Middlewares.map((m) => m.onGetAllMiddlewareStart(req)));
193
+ const query = model.SelectQuery.select('*')
194
+ .take(perPage)
195
+ .skip(page * perPage);
196
+ if (order) {
197
+ query.order(order, orderDirection !== null && orderDirection !== void 0 ? orderDirection : 'ASC');
198
+ }
199
+ applyQueryIncludes(include, query);
200
+ this.Middlewares.forEach((m) => m.onGetAllMiddlewareQuery(query, model.Type, req));
201
+ const result = await query;
202
+ let jResult = modelToJsonApi(result);
203
+ this.Middlewares.forEach((m) => {
204
+ jResult = m.onGetAllMiddlewareResult(jResult, req);
205
+ });
206
+ return new http_1.Ok(jResult);
207
+ }
208
+ async del(model, id, req) {
209
+ await Promise.all(this.Middlewares.map((m) => m.onDeleteMiddlewareStart(id, req)));
210
+ const query = model.DeleteQuery.where(model.Descriptor.PrimaryKey, id);
211
+ this.Middlewares.forEach((m) => m.onDeleteMiddlewareQuery(query, model.Type, req));
212
+ await query;
213
+ this.Middlewares.forEach((m) => m.onDeleteMiddlewareResult(req));
214
+ return new http_1.Ok();
215
+ }
216
+ async patch(model, id, incoming, req) {
217
+ await Promise.all(this.Middlewares.map((m) => m.onUpdateMiddlewareStart(id, incoming, req)));
218
+ const entity = await model.SelectQuery.where(model.Descriptor.PrimaryKey, id).firstOrFail();
219
+ entity.hydrate(incoming.data.attributes);
220
+ // create query, so we can pass to middleware
221
+ const query = model.UpdateQueryBuilder.update(entity.dehydrate()).where(entity.PrimaryKeyName, entity.PrimaryKeyValue);
222
+ this.Middlewares.forEach((m) => m.onUpdateMiddlewareQuery(entity.PrimaryKeyValue, query, model.Type, req));
223
+ await query;
224
+ let jResult = modelToJsonApi(entity);
225
+ this.Middlewares.forEach((m) => {
226
+ jResult = m.onUpdateMiddlewareResult(jResult, req);
227
+ });
228
+ return new http_1.Ok(jResult);
229
+ }
230
+ async insert(model, incoming, req) {
231
+ await Promise.all(this.Middlewares.map((m) => m.onInsertMiddlewareStart(incoming, req)));
232
+ const entity = new model.Type();
233
+ entity.hydrate(incoming.data.attributes);
234
+ let pKey = null;
235
+ const iMidleware = {
236
+ afterQuery: (data) => {
237
+ pKey = data.LastInsertId;
238
+ return data;
239
+ },
240
+ modelCreation: () => null,
241
+ afterHydration: () => null,
242
+ };
243
+ const query = model.InserQuery.middleware(iMidleware).values(entity.dehydrate());
244
+ this.Middlewares.forEach((m) => m.onInsertMiddlewareQuery(query, model.Type, req));
245
+ await query;
246
+ entity.PrimaryKeyValue = pKey;
247
+ let jResult = modelToJsonApi(entity);
248
+ this.Middlewares.forEach((m) => {
249
+ jResult = m.onInsertMiddlewareResult(jResult, req);
250
+ });
251
+ return new http_1.Ok(jResult);
252
+ }
253
+ };
254
+ __decorate([
255
+ (0, http_2.Get)(':model/:id', {
256
+ model: modelSchema,
257
+ id: PrimaryKeySchema,
258
+ include: genericStringSchema,
259
+ _filters: genericStringSchema,
260
+ }),
261
+ __param(0, (0, http_2.Param)()),
262
+ __param(1, (0, http_2.Param)()),
263
+ __param(2, (0, http_1.Query)()),
264
+ __param(3, (0, http_1.Query)()),
265
+ __param(4, (0, http_1.Req)()),
266
+ __metadata("design:type", Function),
267
+ __metadata("design:paramtypes", [Model, Object, Includes, Filters, Object]),
268
+ __metadata("design:returntype", Promise)
269
+ ], JsonApi.prototype, "get", null);
270
+ __decorate([
271
+ (0, http_2.Get)(':model', {
272
+ model: modelSchema,
273
+ include: genericStringSchema,
274
+ _filters: genericStringSchema,
275
+ }),
276
+ __param(0, (0, http_2.Param)()),
277
+ __param(1, (0, http_1.Query)()),
278
+ __param(2, (0, http_1.Query)()),
279
+ __param(3, (0, http_1.Query)()),
280
+ __param(4, (0, http_1.Query)()),
281
+ __param(5, (0, http_1.Query)()),
282
+ __param(6, (0, http_1.Query)()),
283
+ __param(7, (0, http_1.Req)()),
284
+ __metadata("design:type", Function),
285
+ __metadata("design:paramtypes", [Model, Number, Number, String, String, Includes, Filters, Object]),
286
+ __metadata("design:returntype", Promise)
287
+ ], JsonApi.prototype, "getAll", null);
288
+ __decorate([
289
+ (0, http_1.Del)(':model/:id', {
290
+ model: modelSchema,
291
+ id: PrimaryKeySchema,
292
+ }),
293
+ __param(0, (0, http_2.Param)()),
294
+ __param(1, (0, http_2.Param)()),
295
+ __param(2, (0, http_1.Req)()),
296
+ __metadata("design:type", Function),
297
+ __metadata("design:paramtypes", [Model, Object, Object]),
298
+ __metadata("design:returntype", Promise)
299
+ ], JsonApi.prototype, "del", null);
300
+ __decorate([
301
+ (0, http_2.Patch)(':model/:id', {
302
+ model: modelSchema,
303
+ id: PrimaryKeySchema,
304
+ }),
305
+ __param(0, (0, http_2.Param)()),
306
+ __param(1, (0, http_2.Param)()),
307
+ __param(2, (0, http_2.Body)()),
308
+ __param(3, (0, http_1.Req)()),
309
+ __metadata("design:type", Function),
310
+ __metadata("design:paramtypes", [Model, Object, interfaces_1.JsonApiIncomingObject, Object]),
311
+ __metadata("design:returntype", Promise)
312
+ ], JsonApi.prototype, "patch", null);
313
+ __decorate([
314
+ (0, http_1.Post)(':model', {
315
+ model: modelSchema,
316
+ }),
317
+ __param(0, (0, http_2.Param)()),
318
+ __param(1, (0, http_2.Body)()),
319
+ __param(2, (0, http_1.Req)()),
320
+ __metadata("design:type", Function),
321
+ __metadata("design:paramtypes", [Model, interfaces_1.JsonApiIncomingObject, Object]),
322
+ __metadata("design:returntype", Promise)
323
+ ], JsonApi.prototype, "insert", null);
324
+ JsonApi = __decorate([
325
+ (0, http_2.BasePath)('repository'),
326
+ (0, di_1.Inject)(orm_1.Orm, rbac_1.AccessControl),
327
+ __metadata("design:paramtypes", [orm_1.Orm, rbac_1.AccessControl])
328
+ ], JsonApi);
329
+ exports.JsonApi = JsonApi;
330
+ //# sourceMappingURL=JsonApi.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"JsonApi.js","sourceRoot":"","sources":["../../src/controllers/JsonApi.ts"],"names":[],"mappings":"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"}
@@ -3,6 +3,8 @@ import { Constructor } from '@spinajs/di';
3
3
  import { BaseController, Ok } from '@spinajs/http';
4
4
  import { ModelBase, Orm } from '@spinajs/orm';
5
5
  import * as express from 'express';
6
+ import { RepositoryMiddleware } from './../middleware';
7
+ import { JsonApiIncomingObject } from '../interfaces';
6
8
  declare class Includes {
7
9
  Param: string[][];
8
10
  constructor(Param: string[][]);
@@ -11,15 +13,12 @@ declare class Filters {
11
13
  Param: any;
12
14
  constructor(Param: any);
13
15
  }
14
- interface JsonApiIncomingObject {
15
- data: {
16
- attributes: {};
17
- };
18
- }
19
16
  export declare class Repository extends BaseController {
20
17
  protected Orm: Orm;
21
18
  protected Ac: AccessControl;
19
+ protected Middlewares: RepositoryMiddleware[];
22
20
  constructor(Orm: Orm, Ac: AccessControl);
21
+ resolveAsync(): Promise<void>;
23
22
  protected getModel(model: string): Constructor<ModelBase>;
24
23
  private checkPolicy;
25
24
  get(model: string, id: string, include: Includes, _filters: Filters, req: express.Request): Promise<Ok>;
@@ -47,6 +47,7 @@ const orm_1 = require("@spinajs/orm");
47
47
  const lodash_1 = __importDefault(require("lodash"));
48
48
  const express = __importStar(require("express"));
49
49
  const rbac_http_1 = require("@spinajs/rbac-http");
50
+ const middleware_1 = require("./../middleware");
50
51
  class IncludesHydrator extends http_1.ArgHydrator {
51
52
  async hydrate(input) {
52
53
  return new Includes(input ? input.split(',').map((x) => x.split('.')) : []);
@@ -117,6 +118,10 @@ let Repository = class Repository extends http_1.BaseController {
117
118
  this.Orm = Orm;
118
119
  this.Ac = Ac;
119
120
  }
121
+ async resolveAsync() {
122
+ super.resolveAsync();
123
+ this.Middlewares = await di_1.DI.resolve(Array.ofType(middleware_1.RepositoryMiddleware));
124
+ }
120
125
  getModel(model) {
121
126
  return this.Orm.Models.find((x) => x.name.toLowerCase() === model).type;
122
127
  }
@@ -128,45 +133,85 @@ let Repository = class Repository extends http_1.BaseController {
128
133
  }
129
134
  async get(model, id, include, _filters, req) {
130
135
  const mClass = this.getModel(model);
131
- this.checkPolicy(mClass, 'readAny', req);
136
+ await Promise.all(this.Middlewares.map((m) => m.onGetMiddlewareStart(id, req)));
132
137
  const mDesc = (0, orm_1.extractModelDescriptor)(mClass);
133
138
  const query = mClass['where'](mDesc.PrimaryKey, id);
139
+ this.Middlewares.forEach((m) => m.onGetMiddlewareQuery(query, mClass, req));
134
140
  applyQueryIncludes(include, query);
135
141
  const result = await query.firstOrFail();
136
- return new http_1.Ok(modelToJsonApi(result));
142
+ let jResult = modelToJsonApi(result);
143
+ this.Middlewares.forEach((m) => {
144
+ jResult = m.onGetMiddlewareResult(jResult, req);
145
+ });
146
+ return new http_1.Ok(jResult);
137
147
  }
138
148
  async getAll(model, page, perPage, order, orderDirection, include, _filters, req) {
149
+ await Promise.all(this.Middlewares.map((m) => m.onGetAllMiddlewareStart(req)));
139
150
  const mClass = this.getModel(model);
140
- this.checkPolicy(mClass, 'readAny', req);
141
151
  const query = mClass['all'](page !== null && page !== void 0 ? page : 0, perPage !== null && perPage !== void 0 ? perPage : 15);
142
152
  if (order) {
143
153
  query.order(order, orderDirection !== null && orderDirection !== void 0 ? orderDirection : 'asc');
144
154
  }
145
155
  applyQueryIncludes(include, query);
156
+ this.Middlewares.forEach((m) => m.onGetAllMiddlewareQuery(query, mClass, req));
146
157
  const result = await query;
147
- return new http_1.Ok(modelToJsonApi(result));
158
+ let jResult = modelToJsonApi(result);
159
+ this.Middlewares.forEach((m) => {
160
+ jResult = m.onGetAllMiddlewareResult(jResult, req);
161
+ });
162
+ return new http_1.Ok(jResult);
148
163
  }
149
164
  async del(model, id, req) {
165
+ await Promise.all(this.Middlewares.map((m) => m.onDeleteMiddlewareStart(id, req)));
150
166
  const mClass = this.getModel(model);
151
- this.checkPolicy(mClass, 'deleteAny', req);
152
- await mClass['destroy'](id);
167
+ const { query, description } = (0, orm_1.createQuery)(mClass, orm_1.DeleteQueryBuilder);
168
+ query.where(description.PrimaryKey, id);
169
+ this.Middlewares.forEach((m) => m.onDeleteMiddlewareQuery(query, mClass, req));
170
+ await query;
171
+ this.Middlewares.forEach((m) => m.onDeleteMiddlewareResult(req));
153
172
  return new http_1.Ok();
154
173
  }
155
174
  async patch(model, id, incoming, req) {
175
+ await Promise.all(this.Middlewares.map((m) => m.onUpdateMiddlewareStart(id, incoming, req)));
156
176
  const mClass = this.getModel(model);
157
177
  this.checkPolicy(mClass, 'updateAny', req);
158
178
  const entity = await mClass['getOrFail'](id);
159
179
  entity.hydrate(incoming.data.attributes);
160
- await entity.update();
161
- return new http_1.Ok(entity.dehydrate());
180
+ const { query, description } = (0, orm_1.createQuery)(mClass, orm_1.UpdateQueryBuilder);
181
+ query.update(this.dehydrate()).where(description.PrimaryKey, id);
182
+ this.Middlewares.forEach((m) => m.onUpdateMiddlewareQuery(query, mClass, req));
183
+ await query;
184
+ let jResult = modelToJsonApi(entity);
185
+ this.Middlewares.forEach((m) => {
186
+ jResult = m.onUpdateMiddlewareResult(jResult, req);
187
+ });
188
+ return new http_1.Ok(jResult);
162
189
  }
163
190
  async insert(model, incoming, req) {
191
+ await Promise.all(this.Middlewares.map((m) => m.onInsertMiddlewareStart(incoming, req)));
164
192
  const mClass = this.getModel(model);
165
- this.checkPolicy(mClass, 'createAny', req);
166
193
  const entity = new mClass();
167
194
  entity.hydrate(incoming.data.attributes);
168
- await entity.insert();
169
- return new http_1.Ok(entity.dehydrate());
195
+ const { query } = (0, orm_1.createQuery)(mClass, orm_1.InsertQueryBuilder);
196
+ let pKey = null;
197
+ const iMidleware = {
198
+ afterQuery: (data) => {
199
+ pKey = data.LastInsertId;
200
+ return data;
201
+ },
202
+ modelCreation: () => null,
203
+ afterHydration: () => null,
204
+ };
205
+ query.middleware(iMidleware);
206
+ query.values(this.dehydrate());
207
+ this.Middlewares.forEach((m) => m.onInsertMiddlewareQuery(query, mClass, req));
208
+ await query;
209
+ entity.PrimaryKeyValue = pKey;
210
+ let jResult = modelToJsonApi(entity);
211
+ this.Middlewares.forEach((m) => {
212
+ jResult = m.onInsertMiddlewareResult(jResult, req);
213
+ });
214
+ return new http_1.Ok(jResult);
170
215
  }
171
216
  };
172
217
  __decorate([
@@ -1 +1 @@
1
- {"version":3,"file":"Repository.js","sourceRoot":"","sources":["../../src/controllers/Repository.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"Repository.js","sourceRoot":"","sources":["../../src/controllers/Repository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wCAA8C;AAC9C,oCAAsD;AACtD,wCAA4G;AAC5G,wCAAkE;AAClE,sCAAkL;AAClL,oDAAuB;AACvB,iDAAmC;AACnC,kDAA0D;AAC1D,gDAAuD;AAGvD,MAAM,gBAAiB,SAAQ,kBAAW;IACjC,KAAK,CAAC,OAAO,CAAC,KAAU;QAC7B,OAAO,IAAI,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IACtF,CAAC;CACF;AAED,MAAM,eAAgB,SAAQ,kBAAW;IAChC,KAAK,CAAC,OAAO,CAAC,KAAU;QAC7B,OAAO,IAAI,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IACrD,CAAC;CACF;AAED,SAAS,SAAS,CAAC,KAAgB,EAAE,IAAe;IAClD,MAAM,IAAI,GAAG;QACX,IAAI,EAAE,KAAK,CAAC,WAAW,CAAC,IAAI;QAC5B,EAAE,EAAE,KAAK,CAAC,eAAe;QACzB,UAAU,EAAE,KAAK,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,CAAC;QACxC,aAAa,EAAE,gBAAC,CAAC,SAAS,CAAC,gBAAC,CAAC,OAAO,CAAC,KAAK,CAAC,wBAAwB,CAAC,KAAK,CAAC,EAAE,iBAAiB,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE;YACpG,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE;gBAClB,OAAO;oBACL,IAAI,EAAE,EAAE,CAAC,WAAW,CAAC,IAAI;oBACzB,EAAE,EAAE,EAAE,CAAC,eAAe;iBACvB,CAAC;YACJ,CAAC,CAAC,CAAC;QACL,CAAC,CAAC;KACH,CAAC;IACF,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAS,cAAc,CAAC,KAA8B;IACpD,OAAO;QACL,IAAI,EAAE,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC;QAC9E,QAAQ,EAAE,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,gBAAC,CAAC,OAAO,CAAC,KAAK,EAAE,eAAe,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,KAAK,CAAC;KAC5F,CAAC;AACJ,CAAC;AAED,SAAS,eAAe,CAAC,KAAgB;IACvC,OAAO,KAAK,CAAC,wBAAwB,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;AACvE,CAAC;AAED,SAAS,kBAAkB,CAAC,QAAkB,EAAE,KAA8B;IAC5E,IAAI,SAAS,GAA4B,IAAI,CAAC;IAC9C,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;QAC3B,SAAS,GAAG,KAAK,CAAC;QAClB,CAAC,CAAC,OAAO,CAAC,CAAC,EAAU,EAAE,EAAE;YACvB,SAAS,CAAC,QAAQ,CAAC,EAAE,EAAE;gBACrB,SAAS,GAAG,IAAI,CAAC;YACnB,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AAGD,IAAM,QAAQ,GAAd,MAAM,QAAQ;IACZ,YAAmB,KAAiB;QAAjB,UAAK,GAAL,KAAK,CAAY;IAAG,CAAC;CACzC,CAAA;AAFK,QAAQ;IADb,IAAA,eAAQ,EAAC,gBAAgB,CAAC;;GACrB,QAAQ,CAEb;AAGD,IAAM,OAAO,GAAb,MAAM,OAAO;IACX,YAAmB,KAAU;QAAV,UAAK,GAAL,KAAK,CAAK;IAAG,CAAC;CAClC,CAAA;AAFK,OAAO;IADZ,IAAA,eAAQ,EAAC,eAAe,CAAC;;GACpB,OAAO,CAEZ;AAID,IAAa,UAAU,GAAvB,MAAa,UAAW,SAAQ,qBAAc;IAG5C,YAAsB,GAAQ,EAAY,EAAiB;QACzD,KAAK,EAAE,CAAC;QADY,QAAG,GAAH,GAAG,CAAK;QAAY,OAAE,GAAF,EAAE,CAAe;IAE3D,CAAC;IAEM,KAAK,CAAC,YAAY;QACvB,KAAK,CAAC,YAAY,EAAE,CAAC;QACrB,IAAI,CAAC,WAAW,GAAG,MAAM,OAAE,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,iCAAoB,CAAC,CAAC,CAAC;IAC1E,CAAC;IAES,QAAQ,CAAC,KAAa;QAC9B,OAAO,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,EAAE,KAAK,KAAK,CAAC,CAAC,IAAI,CAAC;IAC1E,CAAC;IAEO,WAAW,CAAC,KAA6B,EAAE,UAAkB,EAAE,GAAoB;QACzF,MAAM,CAAC,GAAG,IAAA,gCAAoB,EAAC,GAAG,EAAE,KAAK,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,UAAU,CAAC,CAAC;QAE1E,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,EAAE;YACpB,MAAM,IAAI,gBAAS,CAAC,4DAA4D,KAAK,CAAC,IAAI,SAAS,UAAU,QAAQ,CAAC,CAAC;SACxH;IACH,CAAC;IAGM,KAAK,CAAC,GAAG,CAAU,KAAa,EAAe,EAAU,EAAW,OAAiB,EAAW,QAAiB,EAAS,GAAoB;QACnJ,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QAEpC,MAAM,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,oBAAoB,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC;QAEhF,MAAM,KAAK,GAAG,IAAA,4BAAsB,EAAC,MAAM,CAAC,CAAC;QAC7C,MAAM,KAAK,GAAI,MAAc,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;QAE7D,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,oBAAoB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC;QAE5E,kBAAkB,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QAEnC,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,WAAW,EAAE,CAAC;QACzC,IAAI,OAAO,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC;QAErC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;YAC7B,OAAO,GAAG,CAAC,CAAC,qBAAqB,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;QAClD,CAAC,CAAC,CAAC;QAEH,OAAO,IAAI,SAAE,CAAC,OAAO,CAAC,CAAC;IACzB,CAAC;IAGM,KAAK,CAAC,MAAM,CAAU,KAAa,EAAW,IAAY,EAAW,OAAe,EAAW,KAAa,EAAW,cAAsB,EAAW,OAAiB,EAAW,QAAiB,EAAS,GAAoB;QACvO,MAAM,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,uBAAuB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QAE/E,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QACpC,MAAM,KAAK,GAAI,MAAc,CAAC,KAAK,CAAC,CAAC,IAAI,aAAJ,IAAI,cAAJ,IAAI,GAAI,CAAC,EAAE,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,EAAE,CAAC,CAAC;QAC/D,IAAI,KAAK,EAAE;YACT,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,cAAc,aAAd,cAAc,cAAd,cAAc,GAAI,KAAK,CAAC,CAAC;SAC7C;QAED,kBAAkB,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QAEnC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,uBAAuB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC;QAE/E,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC;QAC3B,IAAI,OAAO,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC;QAErC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;YAC7B,OAAO,GAAG,CAAC,CAAC,wBAAwB,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;QACrD,CAAC,CAAC,CAAC;QAEH,OAAO,IAAI,SAAE,CAAC,OAAO,CAAC,CAAC;IACzB,CAAC;IAGM,KAAK,CAAC,GAAG,CAAU,KAAa,EAAW,EAAU,EAAS,GAAoB;QACvF,MAAM,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,uBAAuB,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC;QAEnF,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QAEpC,MAAM,EAAE,KAAK,EAAE,WAAW,EAAE,GAAG,IAAA,iBAAW,EAAC,MAAM,EAAE,wBAAkB,CAAC,CAAC;QACvE,KAAK,CAAC,KAAK,CAAC,WAAW,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;QAExC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,uBAAuB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC;QAE/E,MAAM,KAAK,CAAC;QAEZ,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,wBAAwB,CAAC,GAAG,CAAC,CAAC,CAAC;QAEjE,OAAO,IAAI,SAAE,EAAE,CAAC;IAClB,CAAC;IAGM,KAAK,CAAC,KAAK,CAAU,KAAa,EAAW,EAAU,EAAU,QAA+B,EAAS,GAAoB;QAClI,MAAM,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,uBAAuB,CAAC,EAAE,EAAE,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC;QAE7F,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QAEpC,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,WAAW,EAAE,GAAG,CAAC,CAAC;QAE3C,MAAM,MAAM,GAAc,MAAO,MAAc,CAAC,WAAW,CAAC,CAAC,EAAE,CAAC,CAAC;QACjE,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAEzC,MAAM,EAAE,KAAK,EAAE,WAAW,EAAE,GAAG,IAAA,iBAAW,EAAC,MAAM,EAAE,wBAAkB,CAAC,CAAC;QACvE,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC,KAAK,CAAC,WAAW,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;QAEjE,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,uBAAuB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC;QAE/E,MAAM,KAAK,CAAC;QACZ,IAAI,OAAO,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC;QACrC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;YAC7B,OAAO,GAAG,CAAC,CAAC,wBAAwB,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;QACrD,CAAC,CAAC,CAAC;QAEH,OAAO,IAAI,SAAE,CAAC,OAAO,CAAC,CAAC;IACzB,CAAC;IAGM,KAAK,CAAC,MAAM,CAAU,KAAa,EAAU,QAA+B,EAAS,GAAoB;QAC9G,MAAM,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,uBAAuB,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC;QAEzF,MAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QACpC,MAAM,MAAM,GAAc,IAAI,MAAM,EAAE,CAAC;QACvC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAEzC,MAAM,EAAE,KAAK,EAAE,GAAG,IAAA,iBAAW,EAAC,MAAM,EAAE,wBAAkB,CAAC,CAAC;QAC1D,IAAI,IAAI,GAAG,IAAI,CAAC;QAChB,MAAM,UAAU,GAAG;YACjB,UAAU,EAAE,CAAC,IAAmB,EAAE,EAAE;gBAClC,IAAI,GAAG,IAAI,CAAC,YAAY,CAAC;gBACzB,OAAO,IAAI,CAAC;YACd,CAAC;YACD,aAAa,EAAE,GAAQ,EAAE,CAAC,IAAI;YAC9B,cAAc,EAAE,GAAQ,EAAE,CAAC,IAAI;SAChC,CAAC;QAEF,KAAK,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;QAC7B,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC;QAE/B,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,uBAAuB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC;QAE/E,MAAM,KAAK,CAAC;QAEZ,MAAM,CAAC,eAAe,GAAG,IAAI,CAAC;QAE9B,IAAI,OAAO,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC;QACrC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;YAC7B,OAAO,GAAG,CAAC,CAAC,wBAAwB,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;QACrD,CAAC,CAAC,CAAC;QAEH,OAAO,IAAI,SAAE,CAAC,OAAO,CAAC,CAAC;IACzB,CAAC;CACF,CAAA;AA5HC;IADC,IAAA,UAAG,EAAC,YAAY,CAAC;IACA,WAAA,IAAA,YAAK,GAAE,CAAA;IAAiB,WAAA,IAAA,YAAK,EAAC,IAAI,CAAC,CAAA;IAAc,WAAA,IAAA,YAAK,GAAE,CAAA;IAAqB,WAAA,IAAA,YAAK,GAAE,CAAA;IAAqB,WAAA,IAAA,UAAG,GAAE,CAAA;;qDAA5C,QAAQ,EAAqB,OAAO;;qCAoBvH;AAGD;IADC,IAAA,UAAG,EAAC,QAAQ,CAAC;IACO,WAAA,IAAA,YAAK,GAAE,CAAA;IAAiB,WAAA,IAAA,YAAK,GAAE,CAAA;IAAgB,WAAA,IAAA,YAAK,GAAE,CAAA;IAAmB,WAAA,IAAA,YAAK,GAAE,CAAA;IAAiB,WAAA,IAAA,YAAK,GAAE,CAAA;IAA0B,WAAA,IAAA,YAAK,GAAE,CAAA;IAAqB,WAAA,IAAA,YAAK,GAAE,CAAA;IAAqB,WAAA,IAAA,UAAG,GAAE,CAAA;;6EAA5C,QAAQ,EAAqB,OAAO;;wCAqB3M;AAGD;IADC,IAAA,UAAG,EAAC,YAAY,CAAC;IACA,WAAA,IAAA,YAAK,GAAE,CAAA;IAAiB,WAAA,IAAA,YAAK,GAAE,CAAA;IAAc,WAAA,IAAA,UAAG,GAAE,CAAA;;;;qCAenE;AAGD;IADC,IAAA,YAAK,EAAC,YAAY,CAAC;IACA,WAAA,IAAA,YAAK,GAAE,CAAA;IAAiB,WAAA,IAAA,YAAK,GAAE,CAAA;IAAc,WAAA,IAAA,WAAI,GAAE,CAAA;IAAmC,WAAA,IAAA,UAAG,GAAE,CAAA;;;;uCAsB9G;AAGD;IADC,IAAA,WAAI,EAAC,QAAQ,CAAC;IACM,WAAA,IAAA,YAAK,GAAE,CAAA;IAAiB,WAAA,IAAA,WAAI,GAAE,CAAA;IAAmC,WAAA,IAAA,UAAG,GAAE,CAAA;;;;wCAiC1F;AApJU,UAAU;IAFtB,IAAA,eAAQ,EAAC,YAAY,CAAC;IACtB,IAAA,WAAM,EAAC,SAAG,EAAE,oBAAa,CAAC;qCAIE,SAAG,EAAgB,oBAAa;GAHhD,UAAU,CAqJtB;AArJY,gCAAU"}
@@ -0,0 +1,8 @@
1
+ export declare class JsonApiIncomingObject {
2
+ data: {
3
+ type: string;
4
+ id: string;
5
+ attributes: any;
6
+ relationships: any;
7
+ };
8
+ }
@@ -0,0 +1,20 @@
1
+ "use strict";
2
+ var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
3
+ var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
4
+ if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
5
+ else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
6
+ return c > 3 && r && Object.defineProperty(target, key, r), r;
7
+ };
8
+ Object.defineProperty(exports, "__esModule", { value: true });
9
+ exports.JsonApiIncomingObject = void 0;
10
+ const validation_1 = require("@spinajs/validation");
11
+ let JsonApiIncomingObject = class JsonApiIncomingObject {
12
+ constructor() {
13
+ this.data = null;
14
+ }
15
+ };
16
+ JsonApiIncomingObject = __decorate([
17
+ (0, validation_1.Schema)('http://json-schema.org/draft-06/schema#')
18
+ ], JsonApiIncomingObject);
19
+ exports.JsonApiIncomingObject = JsonApiIncomingObject;
20
+ //# sourceMappingURL=interfaces.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"interfaces.js","sourceRoot":"","sources":["../src/interfaces.ts"],"names":[],"mappings":";;;;;;;;;AAAA,oDAA6C;AAG7C,IAAa,qBAAqB,GAAlC,MAAa,qBAAqB;IAAlC;QACS,SAAI,GAKP,IAAI,CAAC;IACX,CAAC;CAAA,CAAA;AAPY,qBAAqB;IADjC,IAAA,mBAAM,EAAC,yCAAyC,CAAC;GACrC,qBAAqB,CAOjC;AAPY,sDAAqB"}
@@ -0,0 +1,21 @@
1
+ import { AsyncModule, Constructor } from '@spinajs/di';
2
+ import { DeleteQueryBuilder, InsertQueryBuilder, ModelBase, SelectQueryBuilder, UpdateQueryBuilder } from '@spinajs/orm';
3
+ import * as express from 'express';
4
+ import { JsonApiIncomingObject } from './interfaces';
5
+ export declare abstract class RepositoryMiddleware extends AsyncModule {
6
+ onGetMiddlewareStart(_resource: any, _req: express.Request): Promise<void>;
7
+ onGetAllMiddlewareStart(_req: express.Request): Promise<void>;
8
+ onUpdateMiddlewareStart(_resource: any, _data: JsonApiIncomingObject, _req: express.Request): Promise<void>;
9
+ onInsertMiddlewareStart(_data: JsonApiIncomingObject, _req: express.Request): Promise<void>;
10
+ onDeleteMiddlewareStart(_resource: any, _req: express.Request): Promise<void>;
11
+ onGetMiddlewareQuery(_query: SelectQueryBuilder<any>, _model: Constructor<ModelBase>, _req: express.Request): void;
12
+ onGetAllMiddlewareQuery(_query: SelectQueryBuilder<any>, _model: Constructor<ModelBase>, _req: express.Request): void;
13
+ onUpdateMiddlewareQuery(_resource: any, _query: UpdateQueryBuilder<any>, _model: Constructor<ModelBase>, _req: express.Request): void;
14
+ onInsertMiddlewareQuery(_query: InsertQueryBuilder, _model: Constructor<ModelBase>, _req: express.Request): void;
15
+ onDeleteMiddlewareQuery(_query: DeleteQueryBuilder<any>, _model: Constructor<ModelBase>, _req: express.Request): void;
16
+ onGetMiddlewareResult(jsonData: any, _req: express.Request): any;
17
+ onGetAllMiddlewareResult(jsonData: any, _req: express.Request): any;
18
+ onInsertMiddlewareResult(jsonData: any, _req: express.Request): any;
19
+ onUpdateMiddlewareResult(jsonData: any, _req: express.Request): any;
20
+ onDeleteMiddlewareResult(_req: express.Request): void;
21
+ }
@@ -0,0 +1,31 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.RepositoryMiddleware = void 0;
4
+ const di_1 = require("@spinajs/di");
5
+ class RepositoryMiddleware extends di_1.AsyncModule {
6
+ async onGetMiddlewareStart(_resource, _req) { }
7
+ async onGetAllMiddlewareStart(_req) { }
8
+ async onUpdateMiddlewareStart(_resource, _data, _req) { }
9
+ async onInsertMiddlewareStart(_data, _req) { }
10
+ async onDeleteMiddlewareStart(_resource, _req) { }
11
+ onGetMiddlewareQuery(_query, _model, _req) { }
12
+ onGetAllMiddlewareQuery(_query, _model, _req) { }
13
+ onUpdateMiddlewareQuery(_resource, _query, _model, _req) { }
14
+ onInsertMiddlewareQuery(_query, _model, _req) { }
15
+ onDeleteMiddlewareQuery(_query, _model, _req) { }
16
+ onGetMiddlewareResult(jsonData, _req) {
17
+ return jsonData;
18
+ }
19
+ onGetAllMiddlewareResult(jsonData, _req) {
20
+ return jsonData;
21
+ }
22
+ onInsertMiddlewareResult(jsonData, _req) {
23
+ return jsonData;
24
+ }
25
+ onUpdateMiddlewareResult(jsonData, _req) {
26
+ return jsonData;
27
+ }
28
+ onDeleteMiddlewareResult(_req) { }
29
+ }
30
+ exports.RepositoryMiddleware = RepositoryMiddleware;
31
+ //# sourceMappingURL=middleware.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"middleware.js","sourceRoot":"","sources":["../src/middleware.ts"],"names":[],"mappings":";;;AAAA,oCAAuD;AAKvD,MAAsB,oBAAqB,SAAQ,gBAAW;IACrD,KAAK,CAAC,oBAAoB,CAAC,SAAc,EAAE,IAAqB,IAAkB,CAAC;IACnF,KAAK,CAAC,uBAAuB,CAAC,IAAqB,IAAkB,CAAC;IACtE,KAAK,CAAC,uBAAuB,CAAC,SAAc,EAAE,KAA4B,EAAE,IAAqB,IAAkB,CAAC;IACpH,KAAK,CAAC,uBAAuB,CAAC,KAA4B,EAAE,IAAqB,IAAkB,CAAC;IACpG,KAAK,CAAC,uBAAuB,CAAC,SAAc,EAAE,IAAqB,IAAkB,CAAC;IAEtF,oBAAoB,CAAC,MAA+B,EAAE,MAA8B,EAAE,IAAqB,IAAS,CAAC;IACrH,uBAAuB,CAAC,MAA+B,EAAE,MAA8B,EAAE,IAAqB,IAAS,CAAC;IACxH,uBAAuB,CAAC,SAAc,EAAE,MAA+B,EAAE,MAA8B,EAAE,IAAqB,IAAS,CAAC;IACxI,uBAAuB,CAAC,MAA0B,EAAE,MAA8B,EAAE,IAAqB,IAAS,CAAC;IACnH,uBAAuB,CAAC,MAA+B,EAAE,MAA8B,EAAE,IAAqB,IAAS,CAAC;IAExH,qBAAqB,CAAC,QAAa,EAAE,IAAqB;QAC/D,OAAO,QAAQ,CAAC;IAClB,CAAC;IACM,wBAAwB,CAAC,QAAa,EAAE,IAAqB;QAClE,OAAO,QAAQ,CAAC;IAClB,CAAC;IACM,wBAAwB,CAAC,QAAa,EAAE,IAAqB;QAClE,OAAO,QAAQ,CAAC;IAClB,CAAC;IAEM,wBAAwB,CAAC,QAAa,EAAE,IAAqB;QAClE,OAAO,QAAQ,CAAC;IAClB,CAAC;IAEM,wBAAwB,CAAC,IAAqB,IAAS,CAAC;CAChE;AA5BD,oDA4BC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@spinajs/orm-http",
3
- "version": "1.2.127",
3
+ "version": "1.2.137",
4
4
  "description": "Orm extensions for HTTP module",
5
5
  "main": "lib/index.js",
6
6
  "private": false,
@@ -38,21 +38,21 @@
38
38
  },
39
39
  "homepage": "https://github.com/spinajs/main#readme",
40
40
  "dependencies": {
41
- "@spinajs/configuration": "^1.2.127",
41
+ "@spinajs/configuration": "^1.2.137",
42
42
  "@spinajs/di": "^1.2.127",
43
43
  "@spinajs/exceptions": "^1.2.127",
44
- "@spinajs/http": "^1.2.127",
45
- "@spinajs/intl-orm": "^1.2.127",
46
- "@spinajs/log": "^1.2.127",
47
- "@spinajs/orm": "^1.2.127",
48
- "@spinajs/rbac-http": "^1.2.127",
44
+ "@spinajs/http": "^1.2.137",
45
+ "@spinajs/intl-orm": "^1.2.137",
46
+ "@spinajs/log": "^1.2.137",
47
+ "@spinajs/orm": "^1.2.137",
48
+ "@spinajs/rbac-http": "^1.2.137",
49
49
  "lodash": "^4.17.21",
50
50
  "luxon": "^2.4.0"
51
51
  },
52
52
  "devDependencies": {
53
53
  "@spinajs/http": "1.2.119",
54
54
  "@spinajs/orm": "1.2.125",
55
- "@spinajs/orm-sqlite": "^1.2.127"
55
+ "@spinajs/orm-sqlite": "^1.2.137"
56
56
  },
57
- "gitHead": "53b022d0e70b7f2689ac984578b52afb0fd9e967"
57
+ "gitHead": "2d6036c9ff04c2372dd7ce3300f890490d9f28cd"
58
58
  }